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

Commit 66c2b228 authored by Chad Brubaker's avatar Chad Brubaker
Browse files

Remove stopship workaround for instant app targetSdkVersion 

Instant Apps will need to target O and the v2 security sandbox. Replace
the hack that silently upgrades them with an error.
Test: cts-tradefed run commandAndExit cts-dev -m
CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Fixes: 62444631

Change-Id: If28602924f38c78c06a23efb7e28c8f17528c4cf
parent 053fb912

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

+9 −7
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import static android.content.pm.PackageManager.INSTALL_FAILED_INVALID_INSTALL_L 
import static android.content.pm.PackageManager.INSTALL_FAILED_MISSING_SHARED_LIBRARY;

import static android.content.pm.PackageManager.INSTALL_FAILED_PACKAGE_CHANGED;

import static android.content.pm.PackageManager.INSTALL_FAILED_REPLACE_COULDNT_DELETE;

import static android.content.pm.PackageManager.INSTALL_FAILED_SANDBOX_VERSION_DOWNGRADE;

import static android.content.pm.PackageManager.INSTALL_FAILED_SHARED_USER_INCOMPATIBLE;

import static android.content.pm.PackageManager.INSTALL_FAILED_TEST_ONLY;

import static android.content.pm.PackageManager.INSTALL_FAILED_UPDATE_INCOMPATIBLE;
@@ -17837,16 +17838,17 @@ public class PackageManagerService extends IPackageManager.Stub 














        // Instant apps must have target SDK >= O and have targetSanboxVersion >= 2















        if (instantApp && pkg.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.N_MR1) {













            Slog.w(TAG, "Instant app package " + pkg.packageName













                    + " does not target O, this will be a fatal error.");













            // STOPSHIP: Make this a fatal error













            pkg.applicationInfo.targetSdkVersion = Build.VERSION_CODES.O;













            Slog.w(TAG, "Instant app package " + pkg.packageName + " does not target O");













            res.setError(INSTALL_FAILED_SANDBOX_VERSION_DOWNGRADE,













                    "Instant app package must target O");













            return;















        }















        if (instantApp && pkg.applicationInfo.targetSandboxVersion != 2) {















            Slog.w(TAG, "Instant app package " + pkg.packageName













                    + " does not target targetSandboxVersion 2, this will be a fatal error.");













            // STOPSHIP: Make this a fatal error













            pkg.applicationInfo.targetSandboxVersion = 2;













                    + " does not target targetSandboxVersion 2");













            res.setError(INSTALL_FAILED_SANDBOX_VERSION_DOWNGRADE,













                    "Instant app package must use targetSanboxVersion 2");













            return;















        }





























        if (pkg.applicationInfo.isStaticSharedLibrary()) {