Merge "Fix: ResolverActivity sometimes cannot update the last chosen activity" into nyc-dev

am: f763ea3

* commit 'f763ea3b0573a53543f0031a81bb48d99679977f':
  Fix: ResolverActivity sometimes cannot update the last chosen activity

Change-Id: I9a4fccdae9071de2b28a17408eb34c8103a01b78
This commit is contained in:
Yuichi Biwa
2016-04-12 16:34:54 +00:00
committed by android-build-merger

View File

@@ -760,7 +760,7 @@ public class ResolverActivity extends Activity {
} else { } else {
try { try {
AppGlobals.getPackageManager().setLastChosenActivity(intent, AppGlobals.getPackageManager().setLastChosenActivity(intent,
intent.resolveTypeIfNeeded(getContentResolver()), intent.resolveType(getContentResolver()),
PackageManager.MATCH_DEFAULT_ONLY, PackageManager.MATCH_DEFAULT_ONLY,
filter, bestMatch, intent.getComponent()); filter, bestMatch, intent.getComponent());
} catch (RemoteException re) { } catch (RemoteException re) {