Merge "Merge "Use updatable sysprop to for enabling APEX mgmt" into qt-dev am: ca9056eb66" into qt-dev-plus-aosp

Android.bp

@@ -687,6 +687,7 @@ java_defaults {
         "core/java/com/android/server/DropboxLogTags.logtags",
         "core/java/org/chromium/arc/EventLogTags.logtags",
 
+        ":apex-properties",
         ":platform-properties",
 
         ":framework-statslog-gen",
@@ -1834,4 +1835,4 @@ aidl_mapping {
     name: "framework-aidl-mappings",
     srcs: [":framework-defaults"],
     output: "framework-aidl-mappings.txt"
-}
+}

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

@@ -33,6 +33,7 @@ import android.content.pm.PackageParser.PackageParserException;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.ServiceManager.ServiceNotFoundException;
+import android.sysprop.ApexProperties;
 import android.util.Slog;
 
 import com.android.internal.annotations.GuardedBy;
@@ -237,11 +238,7 @@ class ApexManager {
      * @return true if APEX packages can be managed on this device, false otherwise.
      */
     boolean isApexSupported() {
-        populateActivePackagesCacheIfNeeded();
-        // There is no system-wide property available to check if APEX are flattened and hence can't
-        // be updated. In absence of such property, we assume that if we didn't index APEX packages
-        // since they were flattened, no APEX management should be possible.
-        return !mActivePackagesCache.isEmpty();
+        return ApexProperties.updatable().orElse(false);
     }
 
     /**