Merge "Fix launching home when there are multiple launchers installed" into jb-mr1-dev (3364b2ff) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ResolverActivity.java

+6 −8

Original line number	Diff line number	Diff line
		@@ -150,8 +150,7 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte

		resizeGrid();
		} else if (count == 1) {
		startActivityAsUser(mAdapter.intentForPosition(0),
		new UserHandle(UserHandle.getUserId(mLaunchedFromUid)));
		startActivity(mAdapter.intentForPosition(0));
		mPackageMonitor.unregister();
		mRegistered = false;
		finish();
		@@ -364,12 +363,12 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte
		if (r.match > bestMatch) bestMatch = r.match;
		}
		getPackageManager().addPreferredActivity(filter, bestMatch, set,
		intent.getComponent(), UserHandle.getUserId(mLaunchedFromUid));
		intent.getComponent());
		}
		}

		if (intent != null) {
		startActivityAsUser(intent, new UserHandle(UserHandle.getUserId(mLaunchedFromUid)));
		startActivity(intent);
		}
		}

		@@ -377,7 +376,7 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte
		Intent in = new Intent().setAction("android.settings.APPLICATION_DETAILS_SETTINGS")
		.setData(Uri.fromParts("package", ri.activityInfo.packageName, null))
		.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
		startActivityAsUser(in, new UserHandle(UserHandle.getUserId(mLaunchedFromUid)));
		startActivity(in);
		}

		private final class DisplayResolveInfo {
		@@ -436,10 +435,9 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte
		if (mBaseResolveList != null) {
		mCurrentResolveList = mBaseResolveList;
		} else {
		mCurrentResolveList = mPm.queryIntentActivitiesAsUser(
		mCurrentResolveList = mPm.queryIntentActivities(
		mIntent, PackageManager.MATCH_DEFAULT_ONLY
		\| (mAlwaysUseOption ? PackageManager.GET_RESOLVED_FILTER : 0),
		UserHandle.getUserId(mLaunchedFromUid));
		\| (mAlwaysUseOption ? PackageManager.GET_RESOLVED_FILTER : 0));
		// Filter out any activities that the launched uid does not
		// have permission for. We don't do this when we have an explicit
		// list of resolved activities, because that only happens when