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

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

Merge "Add update packages permission"

parents 3efdec41 adcb5222

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ package android { 
    field public static final java.lang.String INSTALL_GRANT_RUNTIME_PERMISSIONS = "android.permission.INSTALL_GRANT_RUNTIME_PERMISSIONS";

    field public static final java.lang.String INSTALL_LOCATION_PROVIDER = "android.permission.INSTALL_LOCATION_PROVIDER";

    field public static final java.lang.String INSTALL_PACKAGES = "android.permission.INSTALL_PACKAGES";

    field public static final java.lang.String INSTALL_PACKAGE_UPDATES = "android.permission.INSTALL_PACKAGE_UPDATES";

    field public static final java.lang.String INSTALL_SELF_UPDATES = "android.permission.INSTALL_SELF_UPDATES";

    field public static final java.lang.String INTENT_FILTER_VERIFICATION_AGENT = "android.permission.INTENT_FILTER_VERIFICATION_AGENT";

    field public static final java.lang.String INTERACT_ACROSS_USERS = "android.permission.INTERACT_ACROSS_USERS";

core/res/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -2848,6 +2848,14 @@ 
    <permission android:name="android.permission.INSTALL_SELF_UPDATES"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi Allows an application to install updates. This is a limited version

         of {@link android.Manifest.permission#INSTALL_PACKAGES}.

        <p>Not for use by third-party applications.

        @hide

    -->

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

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi Allows an application to clear user data.

         <p>Not for use by third-party applications

         @hide

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

+6 −2
Original line number Diff line number Diff line
@@ -344,9 +344,13 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        final boolean isSelfUpdatePermissionGranted =

                (mPm.checkUidPermission(android.Manifest.permission.INSTALL_SELF_UPDATES,

                        mInstallerUid) == PackageManager.PERMISSION_GRANTED);

        final boolean isUpdatePermissionGranted =

                (mPm.checkUidPermission(android.Manifest.permission.INSTALL_PACKAGE_UPDATES,

                        mInstallerUid) == PackageManager.PERMISSION_GRANTED);

        final int targetPackageUid = mPm.getPackageUid(mPackageName, 0, userId);

        final boolean isPermissionGranted = isInstallPermissionGranted

                || (isSelfUpdatePermissionGranted

                    && mPm.getPackageUid(mPackageName, 0, userId) == mInstallerUid);

                || (isUpdatePermissionGranted && targetPackageUid != -1)

                || (isSelfUpdatePermissionGranted && targetPackageUid == mInstallerUid);

        final boolean isInstallerRoot = (mInstallerUid == Process.ROOT_UID);

        final boolean isInstallerSystem = (mInstallerUid == Process.SYSTEM_UID);

        final boolean forcePermissionPrompt =