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

Move PermissionCallback from PermissionManagerServiceInternal into PermissionManagerService.

Browse Source 
It's only implemented and used in PermissionManagerService.

Bug: 158736025
Test: presubmit
Change-Id: Ia82fdc1af131c27b92793234c8fc92f100dc06d9
This commit is contained in:
Hai Zhang
2020-12-01 22:48:35 -08:00
parent dbf572969d
commit c4679fb3ab
2 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,7 +154,6 @@ import com.android.server.pm.parsing.pkg.AndroidPackage;
import com.android.server.pm.permission.PermissionManagerServiceInternal.DefaultBrowserProvider;
import com.android.server.pm.permission.PermissionManagerServiceInternal.DefaultDialerProvider;
import com.android.server.pm.permission.PermissionManagerServiceInternal.DefaultHomeProvider;
import com.android.server.pm.permission.PermissionManagerServiceInternal.PermissionCallback;
import com.android.server.policy.PermissionPolicyInternal;
import com.android.server.policy.SoftRestrictedPermissionPolicy;
@@ -5418,6 +5417,32 @@ public class PermissionManagerService extends IPermissionManager.Stub {
}
}
/**
* Callbacks invoked when interesting actions have been taken on a permission.
* <p>
* NOTE: The current arguments are merely to support the existing use cases. This
* needs to be properly thought out with appropriate arguments for each of the
* callback methods.
*/
private static class PermissionCallback {
public void onGidsChanged(@AppIdInt int appId, @UserIdInt int userId) {}
public void onPermissionChanged() {}
public void onPermissionGranted(int uid, @UserIdInt int userId) {}
public void onInstallPermissionGranted() {}
public void onPermissionRevoked(int uid, @UserIdInt int userId, String reason) {}
public void onInstallPermissionRevoked() {}
public void onPermissionUpdated(@UserIdInt int[] updatedUserIds, boolean sync) {}
public void onPermissionUpdatedNotifyListener(@UserIdInt int[] updatedUserIds, boolean sync,
int uid) {
onPermissionUpdated(updatedUserIds, sync);
}
public void onPermissionRemoved() {}
public void onInstallPermissionUpdated() {}
public void onInstallPermissionUpdatedNotifyListener(int uid) {
onInstallPermissionUpdated();
}
}
private static final class OnPermissionChangeListeners extends Handler {
private static final int MSG_ON_PERMISSIONS_CHANGED = 1;

36
services/core/java/com/android/server/pm/permission/PermissionManagerServiceInternal.java
View File

@@ -16,7 +16,6 @@
package com.android.server.pm.permission;
import android.annotation.AppIdInt;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
@@ -143,41 +142,6 @@ public abstract class PermissionManagerServiceInternal extends PermissionManager
@NonNull Consumer<Boolean> callback);
}
/**
* Callbacks invoked when interesting actions have been taken on a permission.
* <p>
* NOTE: The current arguments are merely to support the existing use cases. This
* needs to be properly thought out with appropriate arguments for each of the
* callback methods.
*/
public static class PermissionCallback {
public void onGidsChanged(@AppIdInt int appId, @UserIdInt int userId) {
}
public void onPermissionChanged() {
}
public void onPermissionGranted(int uid, @UserIdInt int userId) {
}
public void onInstallPermissionGranted() {
}
public void onPermissionRevoked(int uid, @UserIdInt int userId, String reason) {
}
public void onInstallPermissionRevoked() {
}
public void onPermissionUpdated(@UserIdInt int[] updatedUserIds, boolean sync) {
}
public void onPermissionUpdatedNotifyListener(@UserIdInt int[] updatedUserIds, boolean sync,
int uid) {
onPermissionUpdated(updatedUserIds, sync);
}
public void onPermissionRemoved() {
}
public void onInstallPermissionUpdated() {
}
public void onInstallPermissionUpdatedNotifyListener(int uid) {
onInstallPermissionUpdated();
}
}
public abstract void systemReady();
/**