commit 76074ac509daace2412de58d4c6ee31769720549
author Vivek Sekhar <vsekhar@codeaurora.org> Fri Jun 27 16:33:13 2014 -0700
committer WebTech Code Review <code-review@localhost> Wed Jul 02 11:38:08 2014 -0700
tree f58aa5f9d370f1fe28578b73f08de2cffa5cb1dd
parent 535d4af212b9a5f1341e115600d85aeb029aeeb2

Download to be backwards compatible with stock browser

Change-Id: Ibaf4a28f5c66e09812f1a8fe6003aa0c21a7eb57

src/com/android/browser/DownloadSettings.java

diff --git a/src/com/android/browser/DownloadSettings.java b/src/com/android/browser/DownloadSettings.java
index 4c7c829..b10470b 100644
--- a/src/com/android/browser/DownloadSettings.java
+++ b/src/com/android/browser/DownloadSettings.java
@@ -246,6 +246,12 @@
         if (DOWNLOAD_PATH == requestCode) {
             if (resultCode == Activity.RESULT_OK && intent != null) {
                 downloadPath = intent.getStringExtra("result_dir_sel");
+                // Fallback logic to stock browser
+                if (downloadPath == null) {
+                    Uri uri = intent.getData();
+                    if(uri != null)
+                        downloadPath = uri.getPath();
+                }
                 if (downloadPath != null) {
                     String rawEmulatedStorageTarget = System.getenv(ENV_EMULATED_STORAGE_TARGET);
                     if (!TextUtils.isEmpty(rawEmulatedStorageTarget)) {

src/com/android/browser/preferences/AdvancedPreferencesFragment.java

diff --git a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
index 4abd301..d6fd21d 100644
--- a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
+++ b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
@@ -116,6 +116,12 @@
         if (requestCode == DOWNLOAD_PATH_RESULT_CODE) {
             if (resultCode == Activity.RESULT_OK && data != null) {
                 String downloadPath = data.getStringExtra("result_dir_sel");
+                // Fallback logic to stock browser
+                if (downloadPath == null) {
+                    Uri uri = data.getData();
+                    if(uri != null)
+                        downloadPath = uri.getPath();
+                }
                 if (downloadPath != null) {
                     PreferenceScreen downloadPathPreset =
                             (PreferenceScreen) findPreference(PreferenceKeys.PREF_DOWNLOAD_PATH);