commit 6b7ebbfd26617edc5cca30ae878299663b237cd2
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 25 18:21:47 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 25 18:21:47 2022 +0000
tree 49d88dbe229080285b55da4dec89551d94d7dc3b
parent 94651571bca8504c20ff92d13be50b38a7e06e34
parent 2b932750af642437c5b42a5cff6fbe411d67f20d

Merge "Add dipankarb to storage owners"

core/java/com/android/server/SystemConfig.java

diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java
index fb0b7fd..016d60b 100644
--- a/core/java/com/android/server/SystemConfig.java
+++ b/core/java/com/android/server/SystemConfig.java
@@ -34,6 +34,7 @@
 import android.os.incremental.IncrementalManager;
 import android.os.storage.StorageManager;
 import android.permission.PermissionManager.SplitPermissionInfo;
+import android.sysprop.ApexProperties;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.ArraySet;
@@ -1165,7 +1166,8 @@
                             boolean systemExt = permFile.toPath().startsWith(
                                     Environment.getSystemExtDirectory().toPath() + "/");
                             boolean apex = permFile.toPath().startsWith(
-                                    Environment.getApexDirectory().toPath() + "/");
+                                    Environment.getApexDirectory().toPath() + "/")
+                                    && ApexProperties.updatable().orElse(false);
                             if (vendor) {
                                 readPrivAppPermissions(parser, mVendorPrivAppPermissions,
                                         mVendorPrivAppDenyPermissions);