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

Commit c7df290c authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Android (Google) Code Review
Browse files

Merge "Don't allow installing of new apexes on user builds"

parents 2a0beab0 24e6e128
Loading
Loading
Loading
Loading
+6 −3
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import android.content.pm.PackageParser.SigningDetails.SignatureSchemeVersion;
import android.content.pm.ParceledListSlice;
import android.content.pm.ParceledListSlice;
import android.content.pm.Signature;
import android.content.pm.Signature;
import android.content.rollback.IRollbackManager;
import android.content.rollback.IRollbackManager;
import android.os.Build;
import android.os.Bundle;
import android.os.Bundle;
import android.os.Handler;
import android.os.Handler;
import android.os.IBinder;
import android.os.IBinder;
@@ -117,9 +118,11 @@ public class StagingManager {
        final PackageInfo packageInfo = mApexManager.getActivePackage(packageName);
        final PackageInfo packageInfo = mApexManager.getActivePackage(packageName);


        if (packageInfo == null) {
        if (packageInfo == null) {
            // TODO: What is the right thing to do here ? This implies there's no active package
            // Only allow installing new apexes if on a debuggable build.
            // with the given name. This should never be the case in production (where we only
            if (!Build.IS_DEBUGGABLE) {
            // accept updates to existing APEXes) but may be required for testing.
                Slog.w(TAG, "Attempted to install new apex " + packageName + " on user build");
                return false;
            }
            return true;
            return true;
        }
        }