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

Merge "Should call clearCallingIdentity before accessing getProfileParent" into nyc-dev

Browse Source
This commit is contained in:
Tony Mak
2016-02-24 11:36:39 +00:00
committed by Android (Google) Code Review
parent 61ea6d0bbf 134364556e
commit 8882ce5c2d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -608,7 +608,13 @@ class ActivityStarter {
// app in a locked managed profile from an unlocked parent allow it to resolve
// as user will be sent via confirm credentials to unlock the profile.
UserManager userManager = UserManager.get(mService.mContext);
UserInfo parent = userManager.getProfileParent(userId);
UserInfo parent = null;
long token = Binder.clearCallingIdentity();
try {
parent = userManager.getProfileParent(userId);
} finally {
Binder.restoreCallingIdentity(token);
}
if (parent != null
&& userManager.isUserUnlocked(parent.getUserHandle())
&& !userManager.isUserUnlocked(userInfo.getUserHandle())) {