diff options
| author | Hai Zhang <zhanghai@google.com> | 2018-11-16 16:08:18 -0800 |
|---|---|---|
| committer | Hai Zhang <zhanghai@google.com> | 2018-11-20 01:09:33 +0000 |
| commit | b295ac47931379e5dceb2575702bb73e0c55c39c (patch) | |
| tree | d5bfa762eceba78e3cca3c54fa9a66a9efae523b /core/java/android | |
| parent | 235c7199a871cc01fb281c7febe3368fbe2e70b9 (diff) | |
Fix role granting flow.
This change fixes various issues realted to the role granting
flow, including allowing permission controller to be granted
SET_PREFERRED_APPLICATIONS for roles, granting
MANAGE_ROLE_HOLDERS permission to shell, and improving
RoleUserState XML parsing.
Bug: 110557011
Test: build
Change-Id: Ia095580ad497af9cf7b29e6bedab70046b09d542
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/role/RoleManager.java | 3 | ||||
| -rw-r--r-- | core/java/android/rolecontrollerservice/RoleControllerService.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/app/role/RoleManager.java b/core/java/android/app/role/RoleManager.java index ed27d9fe9fd4..ef86b01beabd 100644 --- a/core/java/android/app/role/RoleManager.java +++ b/core/java/android/app/role/RoleManager.java @@ -25,6 +25,7 @@ import android.annotation.SystemService; import android.content.Context; import android.content.Intent; import android.os.Binder; +import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; @@ -189,7 +190,7 @@ public final class RoleManager { @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS) @SystemApi public List<String> getRoleHolders(@NonNull String roleName) { - return getRoleHoldersAsUser(roleName, UserHandle.of(UserHandle.getCallingUserId())); + return getRoleHoldersAsUser(roleName, Process.myUserHandle()); } /** diff --git a/core/java/android/rolecontrollerservice/RoleControllerService.java b/core/java/android/rolecontrollerservice/RoleControllerService.java index 44c45bb32acd..6eda504f24da 100644 --- a/core/java/android/rolecontrollerservice/RoleControllerService.java +++ b/core/java/android/rolecontrollerservice/RoleControllerService.java @@ -93,8 +93,8 @@ public abstract class RoleControllerService extends Service { @Override public void onGrantDefaultRoles(IRoleManagerCallback callback) { Preconditions.checkNotNull(callback, "callback cannot be null"); - RoleControllerService.this.onGrantDefaultRoles( - new RoleManagerCallbackDelegate(callback)); + RoleControllerService.this.onGrantDefaultRoles(new RoleManagerCallbackDelegate( + callback)); } }; } |