commit 02033386c23a80e723ef9e10c0d923298b215e20
author Mathew Inwood <mathewi@google.com> Tue Apr 24 16:32:17 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 24 16:32:17 2018 +0000
tree c927938e73400a056f42d05f4c0584e63299818c
parent d6afc52a9c3605a6839553c58ddc01fabed91e8e
parent e5dc64d4281dd9f38c2b585202e26ae4278fcfc5

Merge "Add presubmit hook for hidden API lists." into pi-dev

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 866de76..50eaa5c 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -9974,8 +9974,12 @@
         }
 
         // Scan as privileged apps that share a user with a priv-app.
-        if (((scanFlags & SCAN_AS_PRIVILEGED) == 0) && !pkg.isPrivileged()
-                && (pkg.mSharedUserId != null)) {
+        final boolean skipVendorPrivilegeScan = ((scanFlags & SCAN_AS_VENDOR) != 0)
+                && SystemProperties.getInt("ro.vndk.version", 28) < 28;
+        if (((scanFlags & SCAN_AS_PRIVILEGED) == 0)
+                && !pkg.isPrivileged()
+                && (pkg.mSharedUserId != null)
+                && !skipVendorPrivilegeScan) {
             SharedUserSetting sharedUserSetting = null;
             try {
                 sharedUserSetting = mSettings.getSharedUserLPw(pkg.mSharedUserId, 0, 0, false);