Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev

Browse Source
This commit is contained in:
Chad Brubaker
2017-06-13 21:18:23 +00:00
committed by Android (Google) Code Review
parent ab934ae8e6 66c2b22827
commit 4a0ea3e88f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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_MISSING_SHARED_LIBRARY;
import static android.content.pm.PackageManager.INSTALL_FAILED_PACKAGE_CHANGED; 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_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_SHARED_USER_INCOMPATIBLE;
import static android.content.pm.PackageManager.INSTALL_FAILED_TEST_ONLY; import static android.content.pm.PackageManager.INSTALL_FAILED_TEST_ONLY;
import static android.content.pm.PackageManager.INSTALL_FAILED_UPDATE_INCOMPATIBLE; 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 // Instant apps must have target SDK >= O and have targetSanboxVersion >= 2
if (instantApp && pkg.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.N_MR1) { if (instantApp && pkg.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.N_MR1) {
Slog.w(TAG, "Instant app package " + pkg.packageName Slog.w(TAG, "Instant app package " + pkg.packageName + " does not target O");
+ " does not target O, this will be a fatal error."); res.setError(INSTALL_FAILED_SANDBOX_VERSION_DOWNGRADE,
// STOPSHIP: Make this a fatal error "Instant app package must target O");
pkg.applicationInfo.targetSdkVersion = Build.VERSION_CODES.O; return;
} }
if (instantApp && pkg.applicationInfo.targetSandboxVersion != 2) { if (instantApp && pkg.applicationInfo.targetSandboxVersion != 2) {
Slog.w(TAG, "Instant app package " + pkg.packageName Slog.w(TAG, "Instant app package " + pkg.packageName
+ " does not target targetSandboxVersion 2, this will be a fatal error."); + " does not target targetSandboxVersion 2");
// STOPSHIP: Make this a fatal error res.setError(INSTALL_FAILED_SANDBOX_VERSION_DOWNGRADE,
pkg.applicationInfo.targetSandboxVersion = 2; "Instant app package must use targetSanboxVersion 2");
return;
} }
if (pkg.applicationInfo.isStaticSharedLibrary()) { if (pkg.applicationInfo.isStaticSharedLibrary()) {