From e88b042d1d859ec754ed5a5f366bb560b30f67ec Mon Sep 17 00:00:00 2001 From: Xiong Li Date: Thu, 10 Apr 2014 15:25:45 +0800 Subject: Activity chooser "Always" button is not working When ResolverActivity is created with a custom list of matching applications (rList) as in NFC case, and the alwaysUseOption is set to true, the prferredActivity is not saved even if the user presses the "always" button. When a list is provided the variable mBaseResolveList will be != null. This will set mOrigResolveList = null. When an activity is choosen and one of the buttons are pressed onIntentSelected is called. The first thing this method does is to check mAdapter.mOrigResolveList != null, however in this case mOrigResolveList is always null, and the value is not saved as PreferredActivity. This problem was introduced in 6d8dfbd8149942f25f2b9643a12f1fb38f3be834. Change-Id: I9eac41b7861b5e68ad3978af0dc0285f2a34eb88 --- core/java/com/android/internal/app/ResolverActivity.java | 3 +-- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.3-59-g8ed1b