diff --git a/AndroidManifest.xml b/AndroidManifest.xml index eeb969464b5..0eb37f9b297 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -105,6 +105,7 @@ + 0 + ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } @Override @@ -50,8 +55,27 @@ public final class HibernatedAppsPreferenceController extends BasePreferenceCont } private int getNumHibernated() { - //TODO(b/181172051): hook into hibernation service to get the number of hibernated apps. - return 0; + final PackageManager pm = mContext.getPackageManager(); + final AppHibernationManager ahm = mContext.getSystemService(AppHibernationManager.class); + final List hibernatedPackages = ahm.getHibernatingPackagesForUser(); + int numHibernated = hibernatedPackages.size(); + + // Also need to count packages that are auto revoked but not hibernated. + final List packages = pm.getInstalledPackages( + PackageManager.MATCH_DISABLED_COMPONENTS | PackageManager.GET_PERMISSIONS); + for (PackageInfo pi : packages) { + final String packageName = pi.packageName; + if (!hibernatedPackages.contains(packageName) && pi.requestedPermissions != null) { + for (String perm : pi.requestedPermissions) { + if ((pm.getPermissionFlags(perm, packageName, mContext.getUser()) + & PackageManager.FLAG_PERMISSION_AUTO_REVOKED) != 0) { + numHibernated++; + break; + } + } + } + } + return numHibernated; } private static boolean isHibernationEnabled() { diff --git a/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceController.java b/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceController.java index 8ab2c9db6ae..40be629d724 100644 --- a/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceController.java @@ -80,7 +80,8 @@ public final class HibernationSwitchPreferenceController extends AppInfoPreferen /** * Set the package. And also retrieve details from package manager. Some packages may be - * exempted from hibernation by default. + * exempted from hibernation by default. This method should only be called to initialize the + * controller. * @param packageName The name of the package whose hibernation state to be managed. */ void setPackage(@NonNull String packageName) { @@ -93,8 +94,7 @@ public final class HibernationSwitchPreferenceController extends AppInfoPreferen ? android.os.Build.VERSION_CODES.R : android.os.Build.VERSION_CODES.Q; try { - mPackageUid = packageManager.getPackageUidAsUser( - packageName, mContext.getUserId()); + mPackageUid = packageManager.getPackageUid(packageName, /* flags */ 0); mIsPackageExemptByDefault = packageManager.getTargetSdkVersion(packageName) <= maxTargetSdkVersionForExemptApps; mIsPackageSet = true; diff --git a/tests/unit/src/com/android/settings/applications/HibernatedAppsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/HibernatedAppsPreferenceControllerTest.java index cf4c53e157c..a34e6346fb4 100644 --- a/tests/unit/src/com/android/settings/applications/HibernatedAppsPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/applications/HibernatedAppsPreferenceControllerTest.java @@ -23,9 +23,18 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import android.apphibernation.AppHibernationManager; import android.content.Context; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.res.Resources; import android.provider.DeviceConfig; import androidx.test.core.app.ApplicationProvider; @@ -34,23 +43,40 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.Arrays; -/** - * TODO(b/181172051): test getNumberHibernated() when the API implemented - */ @RunWith(AndroidJUnit4.class) public class HibernatedAppsPreferenceControllerTest { + public static final String HIBERNATED_PACKAGE_NAME = "hibernated_package"; + public static final String AUTO_REVOKED_PACKAGE_NAME = "auto_revoked_package"; + public static final String PERMISSION = "permission"; + @Mock + PackageManager mPackageManager; + @Mock + AppHibernationManager mAppHibernationManager; private static final String KEY = "key"; private Context mContext; private HibernatedAppsPreferenceController mController; + private PackageInfo mHibernatedPackage; + private PackageInfo mAutoRevokedPackage; @Before public void setUp() { + MockitoAnnotations.initMocks(this); DeviceConfig.setProperty(NAMESPACE_APP_HIBERNATION, PROPERTY_APP_HIBERNATION_ENABLED, "true", false); mContext = spy(ApplicationProvider.getApplicationContext()); + when(mContext.getPackageManager()).thenReturn(mPackageManager); + when(mContext.getSystemService(AppHibernationManager.class)) + .thenReturn(mAppHibernationManager); mController = new HibernatedAppsPreferenceController(mContext, KEY); + mHibernatedPackage = + getHibernatedPackage(mAppHibernationManager, mPackageManager, mContext); + mAutoRevokedPackage = getAutoRevokedPackage(mPackageManager, mContext); } @Test @@ -60,4 +86,38 @@ public class HibernatedAppsPreferenceControllerTest { assertThat((mController).getAvailabilityStatus()).isNotEqualTo(AVAILABLE); } + + @Test + public void getSummary_shouldReturnCorrectly() { + when(mPackageManager.getInstalledPackages(anyInt())).thenReturn( + Arrays.asList(mHibernatedPackage, mAutoRevokedPackage, new PackageInfo())); + when(mContext.getResources()).thenReturn(mock(Resources.class)); + final int totalHibernated = 2; + + mController.getSummary(); + verify(mContext.getResources()).getQuantityString( + anyInt(), eq(totalHibernated), eq(totalHibernated)); + } + + private static PackageInfo getHibernatedPackage( + AppHibernationManager apm, PackageManager pm, Context context) { + final PackageInfo pi = new PackageInfo(); + pi.packageName = HIBERNATED_PACKAGE_NAME; + pi.requestedPermissions = new String[] {PERMISSION}; + when(apm.getHibernatingPackagesForUser()).thenReturn(Arrays.asList(pi.packageName)); + when(pm.getPermissionFlags( + pi.requestedPermissions[0], pi.packageName, context.getUser())) + .thenReturn(PackageManager.FLAG_PERMISSION_AUTO_REVOKED); + return pi; + } + + private static PackageInfo getAutoRevokedPackage(PackageManager pm, Context context) { + final PackageInfo pi = new PackageInfo(); + pi.packageName = AUTO_REVOKED_PACKAGE_NAME; + pi.requestedPermissions = new String[] {PERMISSION}; + when(pm.getPermissionFlags( + pi.requestedPermissions[0], pi.packageName, context.getUser())) + .thenReturn(PackageManager.FLAG_PERMISSION_AUTO_REVOKED); + return pi; + } }