Merge "Fix failed tests for ApplicationPackageManagerTest" (03a3eb4b) · Commits · e / os / android_frameworks_base

core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -26,8 +26,11 @@ import android.content.pm.PackageInfo;
		import android.os.storage.StorageManager;
		import android.os.storage.VolumeInfo;

		import androidx.annotation.NonNull;
		import androidx.test.filters.LargeTest;

		import com.android.internal.annotations.VisibleForTesting;

		import junit.framework.TestCase;

		import org.mockito.Mockito;
		@@ -110,6 +113,13 @@ public class ApplicationPackageManagerTest extends TestCase {
		public boolean isAllow3rdPartyOnInternal(Context context) {
		return mAllow3rdPartyOnInternal;
		}

		@Override
		@VisibleForTesting
		protected @NonNull List<VolumeInfo> getPackageCandidateVolumes(ApplicationInfo app,
		StorageManager storageManager, IPackageManager pm) {
		return super.getPackageCandidateVolumes(app, storageManager, pm);
		}
		}

		private StorageManager getMockedStorageManager() {
		@@ -223,7 +233,7 @@ public class ApplicationPackageManagerTest extends TestCase {
		appInfo.flags = 0;

		appInfo.volumeUuid = sInternalVolUuid;
		Mockito.when(pm.isPackageDeviceAdminOnAnyUser(Mockito.anyString())).thenReturn(false);
		Mockito.when(pm.isPackageDeviceAdminOnAnyUser(appInfo.packageName)).thenReturn(false);
		appPkgMgr.setAllow3rdPartyOnInternal(true);
		List<VolumeInfo> candidates = appPkgMgr.getPackageCandidateVolumes(
		appInfo, storageManager, pm);
		@@ -231,7 +241,7 @@ public class ApplicationPackageManagerTest extends TestCase {

		appInfo.volumeUuid = sInternalVolUuid;
		appPkgMgr.setAllow3rdPartyOnInternal(true);
		Mockito.when(pm.isPackageDeviceAdminOnAnyUser(Mockito.anyString())).thenReturn(true);
		Mockito.when(pm.isPackageDeviceAdminOnAnyUser(appInfo.packageName)).thenReturn(true);
		candidates = appPkgMgr.getPackageCandidateVolumes(appInfo, storageManager, pm);
		verifyReturnedVolumes(candidates, sInternalVol);