Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35954805 authored by Dario Freni's avatar Dario Freni Committed by android-build-merger
Browse files

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

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

Change-Id: I4a933d405bcca6f6982af30d7faecca477808115
parents dc1b39d5 8de0b2a8

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -690,6 +690,7 @@ java_defaults { 
        "core/java/com/android/server/DropboxLogTags.logtags",

        "core/java/org/chromium/arc/EventLogTags.logtags",



        ":apex-properties",

        ":platform-properties",



        ":framework-statslog-gen",

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

+2 −5
Original line number Diff line number Diff line
@@ -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);

    }



    /**