Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename selfRevokePermissions to revokeOwnPermissionsOnKill

Browse Source 
Test: atest android.permission.cts.RevokeOwnPermissionTest
Bug: 215555831
Bug: 210575642
Bug: 210387494
Change-Id: I94e29f66d13ac76669fab2ccc08879c30c26b7ea
This commit is contained in:
Thomas Vannet
2022-01-13 17:33:50 -08:00
parent d59bc2951c
commit 395f8deeff
13 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -10932,10 +10932,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);

2
core/api/system-current.txt
View File

@@ -9674,9 +9674,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);

4
core/java/android/app/ContextImpl.java
View File

@@ -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

8
core/java/android/content/Context.java
View File

@@ -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");
}

4
core/java/android/content/ContextWrapper.java
View File

@@ -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

2
core/java/android/permission/IPermissionController.aidl
View File

@@ -56,6 +56,6 @@ oneway interface IPermissionController {
in AndroidFuture<String> callback);
void getUnusedAppCount(
in AndroidFuture callback);
void selfRevokePermissions(in String packageName, in List<String> permissions,
void revokeOwnPermissionsOnKill(in String packageName, in List<String> permissions,
in AndroidFuture callback);
}

2
core/java/android/permission/IPermissionManager.aidl
View File

@@ -76,7 +76,7 @@ interface IPermissionManager {
List<SplitPermissionInfoParcelable> getSplitPermissions();
void selfRevokePermissions(String packageName, in List<String> permissions);
void revokeOwnPermissionsOnKill(String packageName, in List<String> permissions);
void startOneTimePermissionSession(String packageName, int userId, long timeout,
int importanceToResetTimer, int importanceToKeepSessionAlive);

6
core/java/android/permission/PermissionControllerManager.java
View File

@@ -836,15 +836,15 @@ public final class PermissionControllerManager {
* @param packageName The name of the package for which the permissions will be revoked.
* @param permissions List of permissions to be revoked.
*
* @see Context#selfRevokePermissions(Collection)
* @see Context#revokeOwnPermissionsOnKill(Collection)
*
* @hide
*/
public void selfRevokePermissions(@NonNull String packageName,
public void revokeOwnPermissionsOnKill(@NonNull String packageName,
@NonNull List<String> permissions) {
mRemoteService.postAsync(service -> {
AndroidFuture<Void> future = new AndroidFuture<>();
service.selfRevokePermissions(packageName, permissions, future);
service.revokeOwnPermissionsOnKill(packageName, permissions, future);
return future;
}).whenComplete((result, err) -> {
if (err != null) {

8
core/java/android/permission/PermissionControllerService.java
View File

@@ -337,10 +337,10 @@ public abstract class PermissionControllerService extends Service {
* @param permissions List of permissions to be revoked.
* @param callback Callback waiting for operation to be complete.
*
* @see PermissionManager#selfRevokePermissions(java.util.Collection)
* @see PermissionManager#revokeOwnPermissionsOnKill(java.util.Collection)
*/
@BinderThread
public void onSelfRevokePermissions(@NonNull String packageName,
public void onRevokeOwnPermissionsOnKill(@NonNull String packageName,
@NonNull List<String> permissions, @NonNull Runnable callback) {
throw new AbstractMethodError("Must be overridden in implementing class");
}
@@ -669,13 +669,13 @@ public abstract class PermissionControllerService extends Service {
}
@Override
public void selfRevokePermissions(@NonNull String packageName,
public void revokeOwnPermissionsOnKill(@NonNull String packageName,
@NonNull List<String> permissions, @NonNull AndroidFuture callback) {
try {
enforceSomePermissionsGrantedToCaller(
Manifest.permission.REVOKE_RUNTIME_PERMISSIONS);
Objects.requireNonNull(callback);
onSelfRevokePermissions(packageName, permissions,
onRevokeOwnPermissionsOnKill(packageName, permissions,
() -> callback.complete(null));
} catch (Throwable t) {
callback.completeExceptionally(t);

6
core/java/android/permission/PermissionManager.java
View File

@@ -562,12 +562,12 @@ public final class PermissionManager {
}
/**
* @see Context#selfRevokePermissions(Collection)
* @see Context#revokeOwnPermissionsOnKill(Collection)
* @hide
*/
public void selfRevokePermissions(@NonNull Collection<String> permissions) {
public void revokeOwnPermissionsOnKill(@NonNull Collection<String> permissions) {
try {
mPermissionManager.selfRevokePermissions(mContext.getPackageName(),
mPermissionManager.revokeOwnPermissionsOnKill(mContext.getPackageName(),
new ArrayList<String>(permissions));
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();

4
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -558,9 +558,9 @@ public class PermissionManagerService extends IPermissionManager.Stub {
}
@Override
public void selfRevokePermissions(@NonNull String packageName,
public void revokeOwnPermissionsOnKill(@NonNull String packageName,
@NonNull List<String> permissions) {
mPermissionManagerServiceImpl.selfRevokePermissions(packageName, permissions);
mPermissionManagerServiceImpl.revokeOwnPermissionsOnKill(packageName, permissions);
}
@Override

4
services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
View File

@@ -1592,7 +1592,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
}
@Override
public void selfRevokePermissions(String packageName, List<String> permissions) {
public void revokeOwnPermissionsOnKill(String packageName, List<String> permissions) {
final int callingUid = Binder.getCallingUid();
int callingUserId = UserHandle.getUserId(callingUid);
int targetPackageUid = mPackageManagerInt.getPackageUid(packageName, 0, callingUserId);
@@ -1607,7 +1607,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+ permName + " because it does not hold that permission");
}
}
mPermissionControllerManager.selfRevokePermissions(packageName, permissions);
mPermissionControllerManager.revokeOwnPermissionsOnKill(packageName, permissions);
}
private boolean mayManageRolePermission(int uid) {

2
services/core/java/com/android/server/pm/permission/PermissionManagerServiceInterface.java
View File

@@ -344,7 +344,7 @@ public interface PermissionManagerServiceInterface extends PermissionManagerInte
* @param packageName The name of the package for which the permissions will be revoked.
* @param permissions List of permissions to be revoked.
*/
void selfRevokePermissions(String packageName, List<String> permissions);
void revokeOwnPermissionsOnKill(String packageName, List<String> permissions);
/**
* Get whether you should show UI with rationale for requesting a permission. You should do this