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

Merge "Implement permission revoke with reason" into rvc-dev

Browse Source
This commit is contained in:
Evan Severson
2020-06-24 23:02:46 +00:00
committed by Android (Google) Code Review
parent ce0cc66945 aacd48b0bc
commit cee666eba9
8 changed files with 62 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/app/ApplicationPackageManager.java
View File

@@ -763,23 +763,24 @@ public class ApplicationPackageManager extends PackageManager {
@Override
public void revokeRuntimePermission(String packageName, String permName, UserHandle user) {
if (DEBUG_TRACE_PERMISSION_UPDATES
&& shouldTraceGrant(packageName, permName, user.getIdentifier())) {
Log.i(TAG, "App " + mContext.getPackageName() + " is revoking " + packageName + " "
+ permName + " for user " + user.getIdentifier(), new RuntimeException());
}
try {
mPermissionManager
.revokeRuntimePermission(packageName, permName, user.getIdentifier());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
revokeRuntimePermission(packageName, permName, user, null);
}
@Override
public void revokeRuntimePermission(String packageName, String permName, UserHandle user,
String reason) {
// TODO evanseverson: impl
if (DEBUG_TRACE_PERMISSION_UPDATES
&& shouldTraceGrant(packageName, permName, user.getIdentifier())) {
Log.i(TAG, "App " + mContext.getPackageName() + " is revoking " + packageName + " "
+ permName + " for user " + user.getIdentifier() + " with reason " + reason,
new RuntimeException());
}
try {
mPermissionManager
.revokeRuntimePermission(packageName, permName, user.getIdentifier(), reason);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
@Override

6
core/java/android/app/IActivityManager.aidl
View File

@@ -677,4 +677,10 @@ interface IActivityManager {
* Return whether the app freezer is supported (true) or not (false) by this system.
*/
boolean isAppFreezerSupported();
/**
* Kills uid with the reason of permission change.
*/
void killUidForPermissionChange(int appId, int userId, String reason);
}

2
core/java/android/app/UiAutomationConnection.java
View File

@@ -294,7 +294,7 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub {
}
final long identity = Binder.clearCallingIdentity();
try {
mPermissionManager.revokeRuntimePermission(packageName, permission, userId);
mPermissionManager.revokeRuntimePermission(packageName, permission, userId, null);
} finally {
Binder.restoreCallingIdentity(identity);
}

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

@@ -71,7 +71,7 @@ interface IPermissionManager {
void grantRuntimePermission(String packageName, String permName, int userId);
void revokeRuntimePermission(String packageName, String permName, int userId);
void revokeRuntimePermission(String packageName, String permName, int userId, String reason);
void resetRuntimePermissions();