am d6d7587a: am a0166b58: Merge "Activity chooser "Always" button is not working"

* commit 'd6d7587ab09e4a0eae9252e11ab59ad27af68823':
  Activity chooser "Always" button is not working
This commit is contained in:
Christopher Tate
2014-05-23 02:27:17 +00:00
committed by Android Git Automerger

View File

@@ -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