Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27b50a6b authored by Michael Wright's avatar Michael Wright Committed by Automerger Merge Worker
Browse files

Merge "Fix failed tests for ApplicationPackageManagerTest" am: 03a3eb4b am:... 

Merge "Fix failed tests for ApplicationPackageManagerTest" am: 03a3eb4b am: 984dcc2c am: 36336e0d am: ea8ec333

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1351251

Change-Id: I56ea0af4942005f20ec7ea51e310287c4fa23ad9
parents 25974bb7 ea8ec333

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);