Merge "HSUM user fixes for ChooserActivityTest" into main (d67f2b30) · Commits · e / os / android_frameworks_base

core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ import android.graphics.drawable.Icon;
		import android.metrics.LogMaker;
		import android.net.Uri;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.provider.DeviceConfig;
		import android.service.chooser.ChooserTarget;
		import android.util.Pair;
		@@ -3178,8 +3179,12 @@ public class ChooserActivityTest {
		}

		private void markWorkProfileUserAvailable() {
		if (UserManager.isHeadlessSystemUserMode()) {
		ChooserActivityOverrideData.getInstance().workProfileUserHandle = UserHandle.of(11);
		} else {
		ChooserActivityOverrideData.getInstance().workProfileUserHandle = UserHandle.of(10);
		}
		}

		private void markCloneProfileUserAvailable() {
		ChooserActivityOverrideData.getInstance().cloneProfileUserHandle = UserHandle.of(11);

+5 −5

Original line number	Diff line number	Diff line
		@@ -155,13 +155,13 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW

		@Override
		protected ResolverListController createListController(UserHandle userHandle) {
		if (userHandle == UserHandle.SYSTEM) {
		when(sOverrides.resolverListController.getUserHandle()).thenReturn(UserHandle.SYSTEM);
		return sOverrides.resolverListController;
		}
		if (userHandle.equals(sOverrides.workProfileUserHandle)) {
		when(sOverrides.workResolverListController.getUserHandle()).thenReturn(userHandle);
		return sOverrides.workResolverListController;
		}
		when(sOverrides.resolverListController.getUserHandle()).thenReturn(userHandle);
		return sOverrides.resolverListController;
		}

		@Override
		public PackageManager getPackageManager() {