commit 5e3e04ceb86014bdde38eb015fc60cfa21e32453
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Oct 15 06:49:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 15 06:49:35 2019 +0000
tree a16b86897e75c7ec4f23f97795838a1af2bf7412
parent 6b905bca2f486b665c5a126474dafed18d86eeb4
parent 408ca7662cb283a6dc82016a8e4a8ff27980a5e8

Merge "Don't set REVOKED_COMPAT for modern apps."

services/core/java/com/android/server/appop/AppOpsService.java

diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index 6c4cc2d..2ac6eb0 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -68,6 +68,7 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Binder;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -1398,6 +1399,12 @@
     }
 
     private void updatePermissionRevokedCompat(int uid, int switchCode, int mode) {
+        PackageManagerInternal packageManagerInternal = LocalServices.getService(
+                PackageManagerInternal.class);
+        if (packageManagerInternal.getUidTargetSdkVersion(uid) >= Build.VERSION_CODES.M) {
+            return;
+        }
+
         PackageManager packageManager = mContext.getPackageManager();
         String[] packageNames = packageManager.getPackagesForUid(uid);
         if (ArrayUtils.isEmpty(packageNames)) {