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

Commit d5aa1c42 authored by Thomas Vannet's avatar Thomas Vannet Committed by Android (Google) Code Review
Browse files

Merge "Rename selfRevokePermissions to revokeOwnPermissionsOnKill"

parents 30bc1ab3 395f8dee

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -10935,10 +10935,10 @@ package android.content { 
    method @Nullable public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, @Nullable String, @Nullable android.os.Handler, int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.BROADCAST_STICKY) public abstract void removeStickyBroadcast(@RequiresPermission android.content.Intent);

    method @Deprecated @RequiresPermission(allOf={"android.permission.INTERACT_ACROSS_USERS", android.Manifest.permission.BROADCAST_STICKY}) public abstract void removeStickyBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle);

    method public void revokeOwnPermissionOnKill(@NonNull String);

    method public void revokeOwnPermissionsOnKill(@NonNull java.util.Collection<java.lang.String>);

    method public abstract void revokeUriPermission(android.net.Uri, int);

    method public abstract void revokeUriPermission(String, android.net.Uri, int);

    method public void selfRevokePermission(@NonNull String);

    method public void selfRevokePermissions(@NonNull java.util.Collection<java.lang.String>);

    method public abstract void sendBroadcast(@RequiresPermission android.content.Intent);

    method public abstract void sendBroadcast(@RequiresPermission android.content.Intent, @Nullable String);

    method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle);

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9697,9 +9697,9 @@ package android.permission { 
    method @BinderThread public void onOneTimePermissionSessionTimeout(@NonNull String);

    method @Deprecated @BinderThread public void onRestoreDelayedRuntimePermissionsBackup(@NonNull String, @NonNull android.os.UserHandle, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method @Deprecated @BinderThread public void onRestoreRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.InputStream, @NonNull Runnable);

    method @BinderThread public void onRevokeOwnPermissionsOnKill(@NonNull String, @NonNull java.util.List<java.lang.String>, @NonNull Runnable);

    method @BinderThread public abstract void onRevokeRuntimePermission(@NonNull String, @NonNull String, @NonNull Runnable);

    method @BinderThread public abstract void onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull String, @NonNull java.util.function.Consumer<java.util.Map<java.lang.String,java.util.List<java.lang.String>>>);

    method @BinderThread public void onSelfRevokePermissions(@NonNull String, @NonNull java.util.List<java.lang.String>, @NonNull Runnable);

    method @Deprecated @BinderThread public abstract void onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method @BinderThread public void onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String, @NonNull android.permission.AdminPermissionControlParams, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method @BinderThread public void onStageAndApplyRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.InputStream, @NonNull Runnable);

core/java/android/app/ContextImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -2179,8 +2179,8 @@ class ContextImpl extends Context { 
    }



    @Override

    public void selfRevokePermissions(@NonNull Collection<String> permissions) {

        getSystemService(PermissionManager.class).selfRevokePermissions(permissions);

    public void revokeOwnPermissionsOnKill(@NonNull Collection<String> permissions) {

        getSystemService(PermissionManager.class).revokeOwnPermissionsOnKill(permissions);

    }



    @Override

core/java/android/content/Context.java

+4 −4
Original line number Diff line number Diff line
@@ -6417,10 +6417,10 @@ public abstract class Context { 
     * Triggers the asynchronous revocation of a permission.

     *

     * @param permName The name of the permission to be revoked.

     * @see #selfRevokePermissions(Collection)

     * @see #revokeOwnPermissionsOnKill(Collection)

     */

    public void selfRevokePermission(@NonNull String permName) {

        selfRevokePermissions(Collections.singletonList(permName));

    public void revokeOwnPermissionOnKill(@NonNull String permName) {

        revokeOwnPermissionsOnKill(Collections.singletonList(permName));

    }



    /**
@@ -6445,7 +6445,7 @@ public abstract class Context { 
     * @see PackageManager#getGroupOfPlatformPermission(String, Executor, Consumer)

     * @see PackageManager#getPlatformPermissionsForGroup(String, Executor, Consumer)

     */

    public void selfRevokePermissions(@NonNull Collection<String> permissions) {

    public void revokeOwnPermissionsOnKill(@NonNull Collection<String> permissions) {

        throw new AbstractMethodError("Must be overridden in implementing class");

    }

core/java/android/content/ContextWrapper.java

+2 −2
Original line number Diff line number Diff line
@@ -1016,8 +1016,8 @@ public class ContextWrapper extends Context { 
    }



    @Override

    public void selfRevokePermissions(@NonNull Collection<String> permissions) {

        mBase.selfRevokePermissions(permissions);

    public void revokeOwnPermissionsOnKill(@NonNull Collection<String> permissions) {

        mBase.revokeOwnPermissionsOnKill(permissions);

    }



    @Override