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

Merge "Force ephemeral apps to have correct targetSdk/targetSandbox temporarily"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-02 19:56:47 +00:00
committed by Android (Google) Code Review
parent 2862dad3fd d143808365
commit 67a14e1124
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16656,13 +16656,19 @@ public class PackageManagerService extends IPackageManager.Stub {
Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
}
// // Ephemeral apps must have target SDK >= O.
// // TODO: Update conditional and error message when O gets locked down
// if (instantApp && pkg.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.N_MR1) {
// res.setError(PackageManager.INSTALL_FAILED_EPHEMERAL_INVALID,
// "Ephemeral apps must have target SDK version of at least O");
// return;
// }
// 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;
}
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;
}
if (pkg.applicationInfo.isStaticSharedLibrary()) {
// Static shared libraries have synthetic package names