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

Commit d8a04614 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

Merge "Un-deprecate PackageManager.replacePreferredActivity." into qt-dev 

am: 552edb80

Change-Id: I2774b283ceac505c467ee5350196b9adb6679a4a
parents f04e2224 552edb80

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1635,7 +1635,7 @@ package android.content.pm { 
    method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryIntentServicesAsUser(@NonNull android.content.Intent, int, @NonNull android.os.UserHandle);

    method public abstract void registerDexModule(@NonNull String, @Nullable android.content.pm.PackageManager.DexModuleRegisterCallback);

    method @RequiresPermission("android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS") public abstract void removeOnPermissionsChangeListener(@NonNull android.content.pm.PackageManager.OnPermissionsChangedListener);

    method @Deprecated public void replacePreferredActivity(@NonNull android.content.IntentFilter, int, @NonNull java.util.List<android.content.ComponentName>, @NonNull android.content.ComponentName);

    method public void replacePreferredActivity(@NonNull android.content.IntentFilter, int, @NonNull java.util.List<android.content.ComponentName>, @NonNull android.content.ComponentName);

    method @RequiresPermission(android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) public abstract void revokeRuntimePermission(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);

    method public void sendDeviceCustomizationReadyBroadcast();

    method @RequiresPermission(allOf={android.Manifest.permission.SET_PREFERRED_APPLICATIONS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public abstract boolean setDefaultBrowserPackageNameAsUser(@Nullable String, int);

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

+0 −8
Original line number Diff line number Diff line
@@ -6178,15 +6178,7 @@ public abstract class PackageManager { 
     * @param activity The component name of the activity that is to be preferred.

     *

     * @hide

     *

     * @deprecated This function no longer does anything. It is the platform's

     * responsibility to assign preferred activities and this cannot be modified

     * directly. To determine the activities resolved by the platform, use

     * {@link #resolveActivity} or {@link #queryIntentActivities}. To configure

     * an app to be responsible for a particular role and to check current role

     * holders, see {@link android.app.role.RoleManager}.

     */

    @Deprecated

    @SystemApi

    public void replacePreferredActivity(@NonNull IntentFilter filter, int match,

            @NonNull List<ComponentName> set, @NonNull ComponentName activity) {