summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxesh R. Ajmera <aajmera@codeaurora.org>2014-12-26 14:36:35 -0800
committerWebTech Code Review <code-review@localhost>2014-12-30 17:20:33 -0800
commitb7fca88906976058135b00b2b84f22398d9d8d76 (patch)
treed0182a407a2595ccb46cef6c058fa17982e27555
parent9b7b58c631f83714d5d1cf8b0aadc50145decd40 (diff)
downloadandroid_packages_apps_Gello-b7fca88906976058135b00b2b84f22398d9d8d76.tar.gz
android_packages_apps_Gello-b7fca88906976058135b00b2b84f22398d9d8d76.tar.bz2
android_packages_apps_Gello-b7fca88906976058135b00b2b84f22398d9d8d76.zip
Fix for handling download path
The file explorer app changed the way it sets the download path and it was not handled correctly by the browser. This change fixes it. Change-Id: I7c400a2dc290b0c990777722646f9b2e91db8478
-rw-r--r--src/com/android/browser/DownloadSettings.java3
-rw-r--r--src/com/android/browser/preferences/AdvancedPreferencesFragment.java2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/browser/DownloadSettings.java b/src/com/android/browser/DownloadSettings.java
index b10470b5..d67d6d60 100644
--- a/src/com/android/browser/DownloadSettings.java
+++ b/src/com/android/browser/DownloadSettings.java
@@ -242,9 +242,8 @@ public class DownloadSettings extends Activity {
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
-
if (DOWNLOAD_PATH == requestCode) {
- if (resultCode == Activity.RESULT_OK && intent != null) {
+ if (resultCode != Activity.RESULT_CANCELED && intent != null) {
downloadPath = intent.getStringExtra("result_dir_sel");
// Fallback logic to stock browser
if (downloadPath == null) {
diff --git a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
index e6f2f1c9..256fe329 100644
--- a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
+++ b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
@@ -123,7 +123,7 @@ public class AdvancedPreferencesFragment
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == DOWNLOAD_PATH_RESULT_CODE) {
- if (resultCode == Activity.RESULT_OK && data != null) {
+ if ( resultCode != Activity.RESULT_CANCELED && data != null) {
String downloadPath = data.getStringExtra("result_dir_sel");
// Fallback logic to stock browser
if (downloadPath == null) {