Merge "Prevent installation of new APEX." into qt-dev

This commit is contained in:
TreeHugger Robot
2019-05-30 06:08:42 +00:00
committed by Android (Google) Code Review

View File

@@ -36,7 +36,6 @@ 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;
@@ -116,12 +115,9 @@ public class StagingManager {
final PackageInfo packageInfo = mApexManager.getPackageInfoForApexName(packageName); final PackageInfo packageInfo = mApexManager.getPackageInfoForApexName(packageName);
if (packageInfo == null) { if (packageInfo == null) {
// Only allow installing new apexes if on a debuggable build. // Don't allow installation of new APEX.
if (!Build.IS_DEBUGGABLE) { Slog.e(TAG, "Attempted to install a new apex " + packageName + ". Rejecting");
Slog.w(TAG, "Attempted to install new apex " + packageName + " on user build"); return false;
return false;
}
return true;
} }
final SigningDetails existingSigningDetails; final SigningDetails existingSigningDetails;