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

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

Merge changes I546a3133,I5d892b2d 

* changes:
  Don't skip verification of Instant Apps
  Expose ACCESS_INSTANT_APPS to the verifier
parents 23f3508b b94103d2

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -3226,7 +3226,7 @@ 
    <!-- Allows the holder to access the instant applications on the device.

    @hide -->

    <permission android:name="android.permission.ACCESS_INSTANT_APPS"

            android:protectionLevel="signature|installer" />

            android:protectionLevel="signature|installer|verifier" />



    <!-- Allows receiving the usage of media resource e.g. video/audio codec and

         graphic memory.

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

+0 −7
Original line number Diff line number Diff line
@@ -13840,13 +13840,6 @@ public class PackageManagerService extends IPackageManager.Stub { 
        if (!DEFAULT_VERIFY_ENABLE) {

            return false;

        }

        // Ephemeral apps don't get the full verification treatment

        if ((installFlags & PackageManager.INSTALL_INSTANT_APP) != 0) {

            if (DEBUG_EPHEMERAL) {

                Slog.d(TAG, "INSTALL_EPHEMERAL so skipping verification");

            }

            return false;

        }















        boolean ensureVerifyAppsEnabled = isUserRestricted(userId, UserManager.ENSURE_VERIFY_APPS);