Merge "Clean up old shim from private-space integration" into main (2e9b2835) · Commits · e / os / android_frameworks_base

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

+2 −7

Original line number	Diff line number	Diff line
		@@ -1875,9 +1875,7 @@ public class ChooserActivity extends ResolverActivity implements
		Bundle b = new Bundle();
		// Add userHandle based badge to the stackedAppDialogBox.
		b.putParcelable(ChooserTargetActionsDialogFragment.USER_HANDLE_KEY,
		getResolveInfoUserHandle(
		targetInfo.getResolveInfo(),
		mChooserMultiProfilePagerAdapter.getCurrentUserHandle()));
		targetInfo.getResolveInfo().userHandle);
		b.putObject(ChooserStackedAppDialogFragment.MULTI_DRI_KEY,
		mti);
		b.putInt(ChooserStackedAppDialogFragment.WHICH_KEY, which);
		@@ -2457,10 +2455,7 @@ public class ChooserActivity extends ResolverActivity implements
		// compares using resolveInfo.userHandle
		mComparator = Comparator.comparing(DisplayResolveInfo::getDisplayLabel, collator)
		.thenComparingInt(displayResolveInfo ->
		getResolveInfoUserHandle(
		displayResolveInfo.getResolveInfo(),
		// TODO: User resolveInfo.userHandle, once its available.
		UserHandle.SYSTEM).getIdentifier());
		displayResolveInfo.getResolveInfo().userHandle.getIdentifier());
		}

		@Override

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -362,8 +362,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
		}
		String resolvedTarget = info.getResolvedComponentName().getPackageName()
		+ '#' + info.getDisplayLabel()
		+ '#' + ResolverActivity.getResolveInfoUserHandle(
		info.getResolveInfo(), getUserHandle()).getIdentifier();
		+ '#' + info.getResolveInfo().userHandle.getIdentifier();
		DisplayResolveInfo multiDri = consolidated.get(resolvedTarget);
		if (multiDri == null) {
		consolidated.put(resolvedTarget, info);

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

+2 −19

Original line number	Diff line number	Diff line
		@@ -1605,8 +1605,7 @@ public class ResolverActivity extends Activity implements
		// In case cloned apps are present, we would want to start those apps in cloned user
		// space, which will not be same as adaptor's userHandle. resolveInfo.userHandle
		// identifies the correct user space in such cases.
		UserHandle activityUserHandle = getResolveInfoUserHandle(
		cti.getResolveInfo(), mMultiProfilePagerAdapter.getCurrentUserHandle());
		UserHandle activityUserHandle = cti.getResolveInfo().userHandle;
		safelyStartActivityAsUser(cti, activityUserHandle, null);
		}

		@@ -2399,11 +2398,7 @@ public class ResolverActivity extends Activity implements
		&& Objects.equals(lhs.activityInfo.packageName, rhs.activityInfo.packageName)
		// Comparing against resolveInfo.userHandle in case cloned apps are present,
		// as they will have the same activityInfo.
		&& Objects.equals(
		getResolveInfoUserHandle(lhs,
		mMultiProfilePagerAdapter.getActiveListAdapter().getUserHandle()),
		getResolveInfoUserHandle(rhs,
		mMultiProfilePagerAdapter.getActiveListAdapter().getUserHandle()));
		&& Objects.equals(lhs.userHandle, rhs.userHandle);
		}

		protected String getMetricsCategory() {
		@@ -2686,18 +2681,6 @@ public class ResolverActivity extends Activity implements
		return userList;
		}

		/**
		* This function is temporary in nature, and its usages will be replaced with just
		* resolveInfo.userHandle, once it is available, once sharesheet is stable.
		*/
		public static UserHandle getResolveInfoUserHandle(ResolveInfo resolveInfo,
		UserHandle predictedHandle) {
		if (resolveInfo.userHandle == null) {
		Log.e(TAG, "ResolveInfo with null UserHandle found: " + resolveInfo);
		}
		return resolveInfo.userHandle;
		}

		private boolean privateSpaceEnabled() {
		return mIsIntentPicker && android.os.Flags.allowPrivateProfile()
		&& android.multiuser.Flags.allowResolverSheetForPrivateSpace()

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -747,8 +747,7 @@ public class ResolverListAdapter extends BaseAdapter {
		Drawable loadIconForResolveInfo(ResolveInfo ri) {
		// Load icons based on userHandle from ResolveInfo. If in work profile/clone profile, icons
		// should be badged.
		return makePresentationGetter(ri)
		.getIcon(ResolverActivity.getResolveInfoUserHandle(ri, getUserHandle()));
		return makePresentationGetter(ri).getIcon(ri.userHandle);
		}

		void loadFilteredItemIconTaskAsync(@NonNull ImageView iconView) {