Merge "Suppress deprecation warnings for unsafeCheckOpNoThrow API call" into main

3 files changed, 62 insertions, 12 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/compat/AppOpsManagerCompat.java b/PermissionController/src/com/android/permissioncontroller/permission/compat/AppOpsManagerCompat.java
new file mode 100644
index 000000000..912c894f2
--- /dev/null
+++ b/PermissionController/src/com/android/permissioncontroller/permission/compat/AppOpsManagerCompat.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.permissioncontroller.permission.compat;
+
+import android.app.AppOpsManager;
+import android.permission.flags.Flags;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Helper AppOpsManager compat class
+ */
+public class AppOpsManagerCompat {
+
+    private AppOpsManagerCompat() {}
+
+    /**
+     * For platform version <= V, call the deprecated unsafeCheckOpRawNoThrow. For newer platforms,
+     * call the new API checkOpRawNoThrow.
+     *
+     * @return the raw mode of the op
+     */
+    @SuppressWarnings("deprecation")
+    public static int checkOpRawNoThrow(@NonNull AppOpsManager appOpsManager, @NonNull String op,
+            int uid, @NonNull String packageName) {
+        if (Flags.checkOpOverloadApiEnabled()) {
+            return appOpsManager.checkOpRawNoThrow(op, uid, packageName, null);
+        } else {
+            return appOpsManager.unsafeCheckOpRawNoThrow(op, uid, packageName);
+        }
+    }
+}
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/data/AppOpLiveData.kt b/PermissionController/src/com/android/permissioncontroller/permission/data/AppOpLiveData.kt
index 1e44f16bd..3202f5b69 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/data/AppOpLiveData.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/data/AppOpLiveData.kt
@@ -19,6 +19,7 @@ package com.android.permissioncontroller.permission.data
 import android.app.AppOpsManager
 import android.app.Application
 import com.android.permissioncontroller.PermissionControllerApplication
+import com.android.permissioncontroller.permission.compat.AppOpsManagerCompat
 
 /**
  * A LiveData which represents the appop state
@@ -36,13 +37,13 @@ private constructor(
     private val app: Application,
     private val packageName: String,
     private val op: String,
-    private val uid: Int
+    private val uid: Int,
 ) : SmartUpdateMediatorLiveData<Int>() {
 
     private val appOpsManager = app.getSystemService(AppOpsManager::class.java)!!
 
     override fun onUpdate() {
-        value = appOpsManager.unsafeCheckOpNoThrow(op, uid, packageName)
+        value = AppOpsManagerCompat.checkOpRawNoThrow(appOpsManager, op, uid, packageName)
     }
 
     override fun onActive() {
@@ -62,7 +63,7 @@ private constructor(
                 PermissionControllerApplication.get(),
                 key.first,
                 key.second,
-                key.third
+                key.third,
             )
         }
     }
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/data/FullStoragePermissionAppsLiveData.kt b/PermissionController/src/com/android/permissioncontroller/permission/data/FullStoragePermissionAppsLiveData.kt
index 4a2d3b68a..2b6d9728e 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/data/FullStoragePermissionAppsLiveData.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/data/FullStoragePermissionAppsLiveData.kt
@@ -28,6 +28,7 @@ import android.app.Application
 import android.os.Build
 import android.os.UserHandle
 import com.android.permissioncontroller.PermissionControllerApplication
+import com.android.permissioncontroller.permission.compat.AppOpsManagerCompat
 import com.android.permissioncontroller.permission.model.livedatatypes.LightPackageInfo
 import kotlinx.coroutines.Job
 
@@ -46,7 +47,7 @@ object FullStoragePermissionAppsLiveData :
         val packageName: String,
         val user: UserHandle,
         val isLegacy: Boolean,
-        val isGranted: Boolean
+        val isGranted: Boolean,
     )
 
     init {
@@ -88,7 +89,7 @@ object FullStoragePermissionAppsLiveData :
     fun getFullStorageStateForPackage(
         appOpsManager: AppOpsManager,
         packageInfo: LightPackageInfo,
-        userHandle: UserHandle? = null
+        userHandle: UserHandle? = null,
     ): FullStoragePackageState? {
         val sdk = packageInfo.targetSdkVersion
         val user = userHandle ?: UserHandle.getUserHandleForUid(packageInfo.uid)
@@ -97,29 +98,31 @@ object FullStoragePermissionAppsLiveData :
                 packageInfo.packageName,
                 user,
                 isLegacy = true,
-                isGranted = true
+                isGranted = true,
             )
         } else if (
             sdk <= Build.VERSION_CODES.Q &&
-                appOpsManager.unsafeCheckOpNoThrow(
+                AppOpsManagerCompat.checkOpRawNoThrow(
+                    appOpsManager,
                     OPSTR_LEGACY_STORAGE,
                     packageInfo.uid,
-                    packageInfo.packageName
+                    packageInfo.packageName,
                 ) == MODE_ALLOWED
         ) {
             return FullStoragePackageState(
                 packageInfo.packageName,
                 user,
                 isLegacy = true,
-                isGranted = true
+                isGranted = true,
             )
         }
         if (MANAGE_EXTERNAL_STORAGE in packageInfo.requestedPermissions) {
             val mode =
-                appOpsManager.unsafeCheckOpNoThrow(
+                AppOpsManagerCompat.checkOpRawNoThrow(
+                    appOpsManager,
                     OPSTR_MANAGE_EXTERNAL_STORAGE,
                     packageInfo.uid,
-                    packageInfo.packageName
+                    packageInfo.packageName,
                 )
             val granted =
                 mode == MODE_ALLOWED ||
@@ -130,7 +133,7 @@ object FullStoragePermissionAppsLiveData :
                 packageInfo.packageName,
                 user,
                 isLegacy = false,
-                isGranted = granted
+                isGranted = granted,
             )
         }
         return null