summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorChristopher Tate <ctate@android.com>2014-05-23 02:17:32 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-05-23 02:17:33 +0000
commita0166b58de38e0d2d67f9d847d307cf3ce7bf633 (patch)
tree758fa85cda1da35af8b7b145368339c819d38661 /core/java
parentfc1ffe89db4bfe51856dadead2ed9c856a96ca65 (diff)
parente88b042d1d859ec754ed5a5f366bb560b30f67ec (diff)
Merge "Activity chooser "Always" button is not working"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/app/ResolverActivity.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 591267e51871..183dd05b9c5b 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -484,8 +484,7 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte
mList.clear();
if (mBaseResolveList != null) {
- currentResolveList = mBaseResolveList;
- mOrigResolveList = null;
+ currentResolveList = mOrigResolveList = mBaseResolveList;
} else {
currentResolveList = mOrigResolveList = mPm.queryIntentActivities(
mIntent, PackageManager.MATCH_DEFAULT_ONLY