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

Merge \"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\" into nyc-dev

Browse Source 
am: f00e780472

Change-Id: Iff3282ba0b141652697c7100ff5db77906666f2e
This commit is contained in:
Sudheer Shanka
2016-06-20 22:43:21 +00:00
committed by android-build-merger
parent b595fdc0e9 f00e780472
commit 7aecaf8d52
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/accounts/AccountManagerService.java
View File

@@ -3538,7 +3538,7 @@ public class AccountManagerService
@Override
public void addSharedAccountsFromParentUser(int parentUserId, int userId) {
checkManageUsersPermission("addSharedAccountsFromParentUser");
checkManageOrCreateUsersPermission("addSharedAccountsFromParentUser");
Account[] accounts = getAccountsAsUser(null, parentUserId, mContext.getOpPackageName());
for (Account account : accounts) {
addSharedAccountAsUser(account, userId);
@@ -5092,6 +5092,16 @@ public class AccountManagerService
}
}
private static void checkManageOrCreateUsersPermission(String message) {
if (ActivityManager.checkComponentPermission(android.Manifest.permission.MANAGE_USERS,
Binder.getCallingUid(), -1, true) != PackageManager.PERMISSION_GRANTED &&
ActivityManager.checkComponentPermission(android.Manifest.permission.CREATE_USERS,
Binder.getCallingUid(), -1, true) != PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("You need MANAGE_USERS or CREATE_USERS permission to: "
+ message);
}
}
private boolean hasExplicitlyGrantedPermission(Account account, String authTokenType,
int callerUid) {
if (callerUid == Process.SYSTEM_UID) {