commit c510cd05e7f139e7da2e4c7ca8040019e5d7afde
author Kevin Han <kevhan@google.com> Tue Jun 08 03:16:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 08 03:16:51 2021 +0000
tree df296b658cc1509908c8e13183e2e73f2b1801b0
parent c46d7c74464da36742e73cca4d6938060e672418
parent 0a9a50dcec3814b46ae3f129e13cb461ccadeb4b

Merge "Check against SDK now that it's updated" into sc-dev am: 0a9a50dcec

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/14885937

Change-Id: Ibc33cc8a1562ea634e27d39a14601539fb433e84

PermissionController/src/com/android/permissioncontroller/hibernation/HibernationController.kt

diff --git a/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationController.kt b/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationController.kt
index d558a5f..9f534d7 100644
--- a/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationController.kt
+++ b/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationController.kt
@@ -59,9 +59,8 @@
                     if (hibernationManager.isHibernatingForUser(pkg.packageName)) {
                         continue
                     }
-                    // TODO(b/184097792): Change this to < S when API finalizes.
                     if (!targetsPreS &&
-                        pkg.targetSdkVersion <= Build.VERSION_CODES.R) {
+                        pkg.targetSdkVersion < Build.VERSION_CODES.S) {
                         // Only apps targeting S or above can be truly hibernated.
                         continue
                     }

PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt

diff --git a/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt b/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt
index 6a23f6e..e97c049 100644
--- a/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt
+++ b/PermissionController/src/com/android/permissioncontroller/hibernation/HibernationPolicy.kt
@@ -347,8 +347,7 @@
  */
 fun UsageStats.lastTimePackageUsed(): Long {
     var lastTimePkgUsed = this.lastTimeVisible
-    // TODO(b/180748832): Change this to SDK check once SDK moves up and feature flag is removed.
-    if (isHibernationEnabled()) {
+    if (SdkLevel.isAtLeastS()) {
         lastTimePkgUsed = maxOf(lastTimePkgUsed, this.lastTimeAnyComponentUsed)
     }
     return lastTimePkgUsed
@@ -696,17 +695,17 @@
 object HibernationEnabledLiveData
     : MutableLiveData<Boolean>() {
     init {
-        // TODO(b/175830282): Add SDK check when platform SDK moves up
-        value = DeviceConfig.getBoolean(
-            NAMESPACE_APP_HIBERNATION, Utils.PROPERTY_APP_HIBERNATION_ENABLED,
-            false /* defaultValue */)
+        value = SdkLevel.isAtLeastS() &&
+            DeviceConfig.getBoolean(NAMESPACE_APP_HIBERNATION,
+            Utils.PROPERTY_APP_HIBERNATION_ENABLED, false /* defaultValue */)
         DeviceConfig.addOnPropertiesChangedListener(
             NAMESPACE_APP_HIBERNATION,
             PermissionControllerApplication.get().mainExecutor,
             { properties ->
                 for (key in properties.keyset) {
                     if (key == Utils.PROPERTY_APP_HIBERNATION_ENABLED) {
-                        value = properties.getBoolean(key, false /* defaultValue */)
+                        value = SdkLevel.isAtLeastS() &&
+                            properties.getBoolean(key, false /* defaultValue */)
                         break
                     }
                 }