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

Merge "Call isUserUnlockingOrUnlocked with cleared identity" into nyc-dev

Browse Source
This commit is contained in:
Fyodor Kupolov
2016-05-13 17:07:57 +00:00
committed by Android (Google) Code Review
parent d180d46711 ce4db0a17f
commit b7bd2e645d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -677,16 +677,17 @@ class ActivityStarter {
// app in a locked managed profile from an unlocked parent allow it to resolve // 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. // as user will be sent via confirm credentials to unlock the profile.
UserManager userManager = UserManager.get(mService.mContext); UserManager userManager = UserManager.get(mService.mContext);
UserInfo parent = null; boolean profileLockedAndParentUnlockingOrUnlocked = false;
long token = Binder.clearCallingIdentity(); long token = Binder.clearCallingIdentity();
try { try {
parent = userManager.getProfileParent(userId); UserInfo parent = userManager.getProfileParent(userId);
profileLockedAndParentUnlockingOrUnlocked = (parent != null)
&& userManager.isUserUnlockingOrUnlocked(parent.id)
&& !userManager.isUserUnlockingOrUnlocked(userId);
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
} }
if (parent != null if (profileLockedAndParentUnlockingOrUnlocked) {
&& userManager.isUserUnlockingOrUnlocked(parent.getUserHandle())
&& !userManager.isUserUnlockingOrUnlocked(userInfo.getUserHandle())) {
rInfo = mSupervisor.resolveIntent(intent, resolvedType, userId, rInfo = mSupervisor.resolveIntent(intent, resolvedType, userId,
PackageManager.MATCH_DIRECT_BOOT_AWARE PackageManager.MATCH_DIRECT_BOOT_AWARE
| PackageManager.MATCH_DIRECT_BOOT_UNAWARE); | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);