summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jay Sullivan <jaysullivan@google.com> 2023-04-11 00:52:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-11 00:52:08 +0000
commitfae96280aa1c3badcef35ea0383dc7d2f21a99eb (patch)
tree321a540bc45a52c77537f6c0ce519223560fcb7a
parent9cfc6b35c4a32cba9da787f6829d5946fe58239c (diff)
parent8a895351f968fbcff4512d93dcae5d35dc50981a (diff)
Merge "Mark onRevokeSelfPermissionsOnKill as T+" into udc-dev am: 8a895351f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/22465676 Change-Id: Ibc267e71eaa55f8d67dc323eefd4f2d455e5ddb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java b/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java
index 82620058d..001520c1b 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java
@@ -34,6 +34,7 @@ import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.os.AsyncTask;
+import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.os.Process;
@@ -50,6 +51,7 @@ import android.util.Xml;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
import com.android.permissioncontroller.PermissionControllerProto.PermissionControllerDumpProto;
import com.android.permissioncontroller.PermissionControllerStatsLog;
@@ -777,6 +779,7 @@ public final class PermissionControllerServiceImpl extends PermissionControllerL
}
@Override
+ @RequiresApi(Build.VERSION_CODES.TIRAMISU)
public void onRevokeSelfPermissionsOnKill(@NonNull String packageName,
@NonNull List<String> permissions, @NonNull Runnable callback) {
PackageInfo pkgInfo = getPkgInfo(packageName);