diff options
| -rw-r--r-- | core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java b/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java index 95da532045ac..d72a400c0078 100644 --- a/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java +++ b/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java @@ -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); |