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

Merge "Post encryption notification after attempting to unlock profiles" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-28 09:32:01 +00:00
committed by Android (Google) Code Review
parent aef1ff0571 b9b2c69e2f
commit dc90c9009b
1 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
services/core/java/com/android/server/locksettings/LockSettingsService.java
View File

@@ -601,21 +601,6 @@ public class LockSettingsService extends ILockSettings.Stub {
// Hide notification first, as tie managed profile lock takes time // Hide notification first, as tie managed profile lock takes time
hideEncryptionNotification(new UserHandle(userId)); hideEncryptionNotification(new UserHandle(userId));
// Now we have unlocked the parent user we should show notifications
// about any profiles that exist.
List<UserInfo> profiles = mUserManager.getProfiles(userId);
for (int i = 0; i < profiles.size(); i++) {
UserInfo profile = profiles.get(i);
final boolean isSecure = isUserSecure(profile.id);
if (isSecure && profile.isManagedProfile()) {
UserHandle userHandle = profile.getUserHandle();
if (!mUserManager.isUserUnlockingOrUnlocked(userHandle) &&
!mUserManager.isQuietModeEnabled(userHandle)) {
showEncryptionNotificationForProfile(userHandle);
}
}
}
if (mUserManager.getUserInfo(userId).isManagedProfile()) { if (mUserManager.getUserInfo(userId).isManagedProfile()) {
tieManagedProfileLockIfNecessary(userId, null); tieManagedProfileLockIfNecessary(userId, null);
} }
@@ -1205,6 +1190,7 @@ public class LockSettingsService extends ILockSettings.Stub {
*/ */
private void unlockUser(int userId, byte[] token, byte[] secret) { private void unlockUser(int userId, byte[] token, byte[] secret) {
// TODO: make this method fully async so we can update UI with progress strings // TODO: make this method fully async so we can update UI with progress strings
final boolean alreadyUnlocked = mUserManager.isUserUnlockingOrUnlocked(userId);
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);
final IProgressListener listener = new IProgressListener.Stub() { final IProgressListener listener = new IProgressListener.Stub() {
@Override @Override
@@ -1235,20 +1221,33 @@ public class LockSettingsService extends ILockSettings.Stub {
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
try {
if (!mUserManager.getUserInfo(userId).isManagedProfile()) { if (mUserManager.getUserInfo(userId).isManagedProfile()) {
final List<UserInfo> profiles = mUserManager.getProfiles(userId); return;
for (UserInfo pi : profiles) { }
for (UserInfo profile : mUserManager.getProfiles(userId)) {
// Unlock managed profile with unified lock // Unlock managed profile with unified lock
if (tiedManagedProfileReadyToUnlock(pi)) { if (tiedManagedProfileReadyToUnlock(profile)) {
unlockChildProfile(pi.id, false /* ignoreUserNotAuthenticated */); try {
} unlockChildProfile(profile.id, false /* ignoreUserNotAuthenticated */);
}
}
} catch (RemoteException e) { } catch (RemoteException e) {
Log.d(TAG, "Failed to unlock child profile", e); Log.d(TAG, "Failed to unlock child profile", e);
} }
} }
// Now we have unlocked the parent user and attempted to unlock the profile we should
// show notifications if the profile is still locked.
if (!alreadyUnlocked) {
long ident = clearCallingIdentity();
try {
maybeShowEncryptionNotificationForUser(profile.id);
} finally {
restoreCallingIdentity(ident);
}
}
}
}
private boolean tiedManagedProfileReadyToUnlock(UserInfo userInfo) { private boolean tiedManagedProfileReadyToUnlock(UserInfo userInfo) {
return userInfo.isManagedProfile() return userInfo.isManagedProfile()