Merge "Show the ResolverActivity in dock mode" into mnc-dev (3c227bf2) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -4230,16 +4230,18 @@ public class PackageManagerService extends IPackageManager.Stub {
		if (ri != null) {
		return ri;
		}
		if (userId != 0) {
		ri = new ResolveInfo(mResolveInfo);
		ri.activityInfo = new ActivityInfo(ri.activityInfo);
		ri.activityInfo.applicationInfo = new ApplicationInfo(
		ri.activityInfo.applicationInfo);
		if (userId != 0) {
		ri.activityInfo.applicationInfo.uid = UserHandle.getUid(userId,
		UserHandle.getAppId(ri.activityInfo.applicationInfo.uid));
		return ri;
		}
		return mResolveInfo;
		// Make sure that the resolver is displayable in car mode
		if (ri.activityInfo.metaData == null) ri.activityInfo.metaData = new Bundle();
		ri.activityInfo.metaData.putBoolean(Intent.METADATA_DOCK_HOME, true);
		return ri;
		}
		}
		return null;