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

Commit 33224731 authored by Dario Freni's avatar Dario Freni Committed by Todd Kennedy
Browse files

Prevent installation of new APEX. 

This was previously only done on user build and the code convergence
caused bugs that we haven't spotted for a while.

Change-Id: Ib7f51b5ef6d3f221483eb2e2dcb2f4d19a0fbbee
Fixes: 132429173
Test: APEX CTS tests on both user and userdebug builds
parent f953da0c

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

+3 −7
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.content.pm.PackageParser.SigningDetails.SignatureSchemeVersion; 
import android.content.pm.ParceledListSlice;

import android.content.pm.Signature;

import android.content.rollback.IRollbackManager;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;
@@ -116,13 +115,10 @@ public class StagingManager { 
        final PackageInfo packageInfo = mApexManager.getPackageInfoForApexName(packageName);



        if (packageInfo == null) {

            // Only allow installing new apexes if on a debuggable build.

            if (!Build.IS_DEBUGGABLE) {

                Slog.w(TAG, "Attempted to install new apex " + packageName + " on user build");

            // Don't allow installation of new APEX.

            Slog.e(TAG, "Attempted to install a new apex " + packageName + ". Rejecting");

            return false;

        }

            return true;

        }



        final SigningDetails existingSigningDetails;

        try {