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

Commit 02a0aad4 authored by Hall Liu's avatar Hall Liu
Browse files

Expose PackageManager methods around system apps 

Expose PackageManager#setSystemAppState and associated constants for use
by a future Telephony mainline module. Add restrictions on modifying
core apps if the caller is not from the system or phone uids.

Fixes: 168621241
Test: atest PackageManagerTest#testSetSystemAppHiddenUntilInstalled
Change-Id: I9a219b4b24abdb90dccca81038279bdae4285e7f
parent c7393c8e

api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -2198,6 +2198,7 @@ package android.content.pm { 
    method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] setPackagesSuspended(@Nullable String[], boolean, @Nullable android.os.PersistableBundle, @Nullable android.os.PersistableBundle, @Nullable String);

    method @Nullable @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] setPackagesSuspended(@Nullable String[], boolean, @Nullable android.os.PersistableBundle, @Nullable android.os.PersistableBundle, @Nullable android.content.pm.SuspendDialogInfo);

    method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public void setSyntheticAppDetailsActivityEnabled(@NonNull String, boolean);

    method public void setSystemAppState(@NonNull String, int);

    method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public abstract void setUpdateAvailable(@NonNull String, boolean);

    method @RequiresPermission(android.Manifest.permission.SET_PREFERRED_APPLICATIONS) public abstract boolean updateIntentVerificationStatusAsUser(@NonNull String, int, int);

    method @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS}) public abstract void updatePermissionFlags(@NonNull String, @NonNull String, @android.content.pm.PackageManager.PermissionFlags int, @android.content.pm.PackageManager.PermissionFlags int, @NonNull android.os.UserHandle);
@@ -2276,11 +2277,16 @@ package android.content.pm { 
    field @Deprecated public static final int MASK_PERMISSION_FLAGS = 255; // 0xff

    field public static final int MATCH_ANY_USER = 4194304; // 0x400000

    field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000

    field public static final int MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS = 536870912; // 0x20000000

    field public static final int MATCH_INSTANT = 8388608; // 0x800000

    field public static final int MODULE_APEX_NAME = 1; // 0x1

    field public static final int RESTRICTION_HIDE_FROM_SUGGESTIONS = 1; // 0x1

    field public static final int RESTRICTION_HIDE_NOTIFICATIONS = 2; // 0x2

    field public static final int RESTRICTION_NONE = 0; // 0x0

    field public static final int SYSTEM_APP_STATE_HIDDEN_UNTIL_INSTALLED_HIDDEN = 0; // 0x0

    field public static final int SYSTEM_APP_STATE_HIDDEN_UNTIL_INSTALLED_VISIBLE = 1; // 0x1

    field public static final int SYSTEM_APP_STATE_INSTALLED = 2; // 0x2

    field public static final int SYSTEM_APP_STATE_UNINSTALLED = 3; // 0x3

  }















  public abstract static class PackageManager.DexModuleRegisterCallback {

































core/java/android/content/pm/PackageManager.java



+22
−6




























Original line number
Diff line number
Diff line








@@ -563,9 +563,11 @@ public abstract class PackageManager {













    public static final int MATCH_DEBUG_TRIAGED_MISSING = MATCH_DIRECT_BOOT_AUTO;































    /**













     * Internal {@link PackageInfo} flag used to indicate that a package is a hidden system app.













     * {@link PackageInfo} flag: include system apps that are in the uninstalled state and have













     * been set to be hidden until installed via {@link #setSystemAppState}.















     * @hide















     */













    @SystemApi















    public static final int MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS =  0x20000000;































    /**










@@ -3744,27 +3746,34 @@ public abstract class PackageManager {













    public @interface SystemAppState {}































    /**













     * Constant for noting system app state as hidden before installation













     * Constant for use with {@link #setSystemAppState} to mark a system app as hidden until













     * installation.















     * @hide















     */













    @SystemApi















    public static final int SYSTEM_APP_STATE_HIDDEN_UNTIL_INSTALLED_HIDDEN = 0;































    /**













     * Constant for noting system app state as visible before installation













     * Constant for use with {@link #setSystemAppState} to mark a system app as not hidden until













     * installation.















     * @hide















     */













    @SystemApi















    public static final int SYSTEM_APP_STATE_HIDDEN_UNTIL_INSTALLED_VISIBLE = 1;































    /**













     * Constant for noting system app state as installed













     * Constant for use with {@link #setSystemAppState} to change a system app's state to installed.















     * @hide















     */













    @SystemApi















    public static final int SYSTEM_APP_STATE_INSTALLED = 2;































    /**













     * Constant for noting system app state as not installed













     * Constant for use with {@link #setSystemAppState} to change a system app's state to













     * uninstalled.















     * @hide















     */













    @SystemApi















    public static final int SYSTEM_APP_STATE_UNINSTALLED = 3;































    /**










@@ -7047,11 +7056,18 @@ public abstract class PackageManager {













            @NonNull UserHandle userHandle);































    /**













     * Sets system app state













     * Sets the state of a system app.













     *













     * This method can be used to change a system app's hidden-until-installed state (via













     * {@link #SYSTEM_APP_STATE_HIDDEN_UNTIL_INSTALLED_HIDDEN} and













     * {@link #SYSTEM_APP_STATE_HIDDEN_UNTIL_INSTALLED_VISIBLE} or its installation state (via













     * {@link #SYSTEM_APP_STATE_INSTALLED} and {@link #SYSTEM_APP_STATE_UNINSTALLED}.













     *















     * @param packageName Package name of the app.















     * @param state State of the app.















     * @hide















     */













    @SystemApi















    public void setSystemAppState(@NonNull String packageName, @SystemAppState int state) {















        throw new RuntimeException("Not implemented. Must override in a subclass");















    }

































non-updatable-api/system-current.txt



+6
−0




























Original line number
Diff line number
Diff line








@@ -2138,6 +2138,7 @@ package android.content.pm {













    method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] setPackagesSuspended(@Nullable String[], boolean, @Nullable android.os.PersistableBundle, @Nullable android.os.PersistableBundle, @Nullable String);















    method @Nullable @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] setPackagesSuspended(@Nullable String[], boolean, @Nullable android.os.PersistableBundle, @Nullable android.os.PersistableBundle, @Nullable android.content.pm.SuspendDialogInfo);















    method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public void setSyntheticAppDetailsActivityEnabled(@NonNull String, boolean);













    method public void setSystemAppState(@NonNull String, int);















    method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public abstract void setUpdateAvailable(@NonNull String, boolean);















    method @RequiresPermission(android.Manifest.permission.SET_PREFERRED_APPLICATIONS) public abstract boolean updateIntentVerificationStatusAsUser(@NonNull String, int, int);















    method @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS}) public abstract void updatePermissionFlags(@NonNull String, @NonNull String, @android.content.pm.PackageManager.PermissionFlags int, @android.content.pm.PackageManager.PermissionFlags int, @NonNull android.os.UserHandle);










@@ -2216,11 +2217,16 @@ package android.content.pm {













    field @Deprecated public static final int MASK_PERMISSION_FLAGS = 255; // 0xff















    field public static final int MATCH_ANY_USER = 4194304; // 0x400000















    field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000













    field public static final int MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS = 536870912; // 0x20000000















    field public static final int MATCH_INSTANT = 8388608; // 0x800000















    field public static final int MODULE_APEX_NAME = 1; // 0x1















    field public static final int RESTRICTION_HIDE_FROM_SUGGESTIONS = 1; // 0x1















    field public static final int RESTRICTION_HIDE_NOTIFICATIONS = 2; // 0x2















    field public static final int RESTRICTION_NONE = 0; // 0x0













    field public static final int SYSTEM_APP_STATE_HIDDEN_UNTIL_INSTALLED_HIDDEN = 0; // 0x0













    field public static final int SYSTEM_APP_STATE_HIDDEN_UNTIL_INSTALLED_VISIBLE = 1; // 0x1













    field public static final int SYSTEM_APP_STATE_INSTALLED = 2; // 0x2













    field public static final int SYSTEM_APP_STATE_UNINSTALLED = 3; // 0x3















  }





























  public abstract static class PackageManager.DexModuleRegisterCallback {

































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



+20
−4




























Original line number
Diff line number
Diff line








@@ -13255,13 +13255,21 @@ public class PackageManagerService extends IPackageManager.Stub













    @Override















    public void setSystemAppHiddenUntilInstalled(String packageName, boolean hidden) {















        final int callingUid = Binder.getCallingUid();













        PackageManagerServiceUtils













                .enforceSystemOrPhoneCaller("setSystemAppHiddenUntilInstalled", callingUid);













        final boolean calledFromSystemOrPhone = callingUid == Process.PHONE_UID













                || callingUid == Process.SYSTEM_UID;













        if (!calledFromSystemOrPhone) {













            mContext.enforceCallingOrSelfPermission(Manifest.permission.SUSPEND_APPS,













                    "setSystemAppHiddenUntilInstalled");













        }



























        synchronized (mLock) {















            final PackageSetting pkgSetting = mSettings.mPackages.get(packageName);















            if (pkgSetting == null || !pkgSetting.isSystem()) {















                return;















            }













            if (pkgSetting.getPkg().isCoreApp() && !calledFromSystemOrPhone) {













                throw new SecurityException("Only system or phone callers can modify core apps");













            }















            pkgSetting.getPkgState().setHiddenUntilInstalled(hidden);















            final PackageSetting disabledPs = mSettings.getDisabledSystemPkgLPr(packageName);















            if (disabledPs == null) {









@@ -13274,14 +13282,22 @@ public class PackageManagerService extends IPackageManager.Stub













    @Override















    public boolean setSystemAppInstallState(String packageName, boolean installed, int userId) {















        final int callingUid = Binder.getCallingUid();













        PackageManagerServiceUtils













                .enforceSystemOrPhoneCaller("setSystemAppInstallState", callingUid);













        final boolean calledFromSystemOrPhone = callingUid == Process.PHONE_UID













                || callingUid == Process.SYSTEM_UID;













        if (!calledFromSystemOrPhone) {













            mContext.enforceCallingOrSelfPermission(Manifest.permission.SUSPEND_APPS,













                    "setSystemAppHiddenUntilInstalled");













        }



























        synchronized (mLock) {















            final PackageSetting pkgSetting = mSettings.mPackages.get(packageName);















            // The target app should always be in system















            if (pkgSetting == null || !pkgSetting.isSystem()) {















                return false;















            }













            if (pkgSetting.getPkg().isCoreApp() && !calledFromSystemOrPhone) {













                throw new SecurityException("Only system or phone callers can modify core apps");













            }















            // Check if the install state is the same















            if (pkgSetting.getInstalled(userId) == installed) {















                return false;