diff options
author | Axesh R. Ajmera <aajmera@codeaurora.org> | 2015-01-13 16:20:45 -0800 |
---|---|---|
committer | Axesh R. Ajmera <aajmera@codeaurora.org> | 2015-01-13 17:04:46 -0800 |
commit | 699fd51a086c1c3afd95b5b113fb58d7d48a23a6 (patch) | |
tree | 9960e877cd6e20614d2510d0d5bc3734b745005d /src/com/android/browser/UploadHandler.java | |
parent | 7d5eb33b6b68694c57b0729be312b9d649fb3f5d (diff) | |
download | android_packages_apps_Gello-699fd51a086c1c3afd95b5b113fb58d7d48a23a6.tar.gz android_packages_apps_Gello-699fd51a086c1c3afd95b5b113fb58d7d48a23a6.tar.bz2 android_packages_apps_Gello-699fd51a086c1c3afd95b5b113fb58d7d48a23a6.zip |
Fix for Duplicate FileChooser Result exception
The callback was not getting cleaned up properly
due to which exception was getting triggered
when browser was getting destroyed.
Change-Id: I97400e72eb52e3f7af6e01d82479b1764cd9b4af
Diffstat (limited to 'src/com/android/browser/UploadHandler.java')
-rw-r--r-- | src/com/android/browser/UploadHandler.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/browser/UploadHandler.java b/src/com/android/browser/UploadHandler.java index 6b0a39f9..c06d24eb 100644 --- a/src/com/android/browser/UploadHandler.java +++ b/src/com/android/browser/UploadHandler.java @@ -75,8 +75,11 @@ public class UploadHandler { protected void setHandled(boolean handled) { mHandled = handled; mCaughtActivityNotFoundException = false; - if (!mHandled) + // If upload dialog shown to the user got dismissed + if (!mHandled) { mUploadFilePaths.onReceiveValue(null); + } + mUploadFilePaths = null; } void onResult(int resultCode, Intent intent) { @@ -151,15 +154,13 @@ public class UploadHandler { if (mUploadFilePaths != null) { if (hasGoodFilePath && !isDRMFileType) { Log.d(TAG, "upload file path:" + filePath); - mUploadFilePaths.onReceiveValue(new String[]{filePath}); } else { mUploadFilePaths.onReceiveValue(null); } } - mHandled = true; - mCaughtActivityNotFoundException = false; + setHandled(true); } |