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

Commit de0fb617 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "don't require 'O' for instant apps"

parents a3c064d1 910a19a5

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

+7 −7
Original line number Diff line number Diff line
@@ -16484,13 +16484,13 @@ 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 (ephemeral && 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;













        }













//        // Ephemeral apps must have target SDK >= O.













//        // TODO: Update conditional and error message when O gets locked down













//        if (ephemeral && 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;













//        }





























        if (pkg.applicationInfo.isStaticSharedLibrary()) {















            // Static shared libraries have synthetic package names