commit b7fca88906976058135b00b2b84f22398d9d8d76
author Axesh  R. Ajmera <aajmera@codeaurora.org> Fri Dec 26 14:36:35 2014 -0800
committer WebTech Code Review <code-review@localhost> Tue Dec 30 17:20:33 2014 -0800
tree d0182a407a2595ccb46cef6c058fa17982e27555
parent 9b7b58c631f83714d5d1cf8b0aadc50145decd40

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

src/com/android/browser/DownloadSettings.java

diff --git a/src/com/android/browser/DownloadSettings.java b/src/com/android/browser/DownloadSettings.java
index b10470b..d67d6d6 100644
--- a/src/com/android/browser/DownloadSettings.java
+++ b/src/com/android/browser/DownloadSettings.java
@@ -242,9 +242,8 @@
 
     @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) {

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 e6f2f1c..256fe32 100644
--- a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
+++ b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
@@ -123,7 +123,7 @@
 
     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) {