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

Merge "Diagnostic logging for profile encryption notification" into tm-dev

Browse Source
This commit is contained in:
Pavel Grafov
2022-03-30 10:35:38 +00:00
committed by Android (Google) Code Review
parent ca3d495ca6 d7e8c0492b
commit 0d8aaf4b6b
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -635,7 +635,7 @@ public class LockSettingsService extends ILockSettings.Stub {
* If the account is credential-encrypted, show notification requesting the user to unlock the * If the account is credential-encrypted, show notification requesting the user to unlock the
* device. * device.
*/ */
private void maybeShowEncryptionNotificationForUser(@UserIdInt int userId) { private void maybeShowEncryptionNotificationForUser(@UserIdInt int userId, String reason) {
final UserInfo user = mUserManager.getUserInfo(userId); final UserInfo user = mUserManager.getUserInfo(userId);
if (!user.isManagedProfile()) { if (!user.isManagedProfile()) {
// When the user is locked, we communicate it loud-and-clear // When the user is locked, we communicate it loud-and-clear
@@ -659,28 +659,35 @@ public class LockSettingsService extends ILockSettings.Stub {
!mUserManager.isQuietModeEnabled(userHandle)) { !mUserManager.isQuietModeEnabled(userHandle)) {
// Only show notifications for managed profiles once their parent // Only show notifications for managed profiles once their parent
// user is unlocked. // user is unlocked.
showEncryptionNotificationForProfile(userHandle); showEncryptionNotificationForProfile(userHandle, reason);
} }
} }
} }
private void showEncryptionNotificationForProfile(UserHandle user) { private void showEncryptionNotificationForProfile(UserHandle user, String reason) {
Resources r = mContext.getResources(); Resources r = mContext.getResources();
CharSequence title = getEncryptionNotificationTitle(); CharSequence title = getEncryptionNotificationTitle();
CharSequence message = getEncryptionNotificationMessage(); CharSequence message = getEncryptionNotificationMessage();
CharSequence detail = getEncryptionNotificationDetail(); CharSequence detail = getEncryptionNotificationDetail();
final KeyguardManager km = (KeyguardManager) mContext.getSystemService(KEYGUARD_SERVICE); final KeyguardManager km = (KeyguardManager) mContext.getSystemService(KEYGUARD_SERVICE);
final Intent unlockIntent = km.createConfirmDeviceCredentialIntent(null, null, final Intent unlockIntent =
user.getIdentifier()); km.createConfirmDeviceCredentialIntent(null, null, user.getIdentifier());
if (unlockIntent == null) { if (unlockIntent == null) {
return; return;
} }
// Suppress all notifications on non-FBE devices for now
if (!StorageManager.isFileEncryptedNativeOrEmulated()) return;
unlockIntent.setFlags( unlockIntent.setFlags(
Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
PendingIntent intent = PendingIntent.getActivity(mContext, 0, unlockIntent, PendingIntent intent = PendingIntent.getActivity(mContext, 0, unlockIntent,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED);
Slog.d(TAG, String.format("showing encryption notification, user: %d; reason: %s",
user.getIdentifier(), reason));
showEncryptionNotification(user, title, message, detail, intent); showEncryptionNotification(user, title, message, detail, intent);
} }
@@ -704,11 +711,6 @@ public class LockSettingsService extends ILockSettings.Stub {
private void showEncryptionNotification(UserHandle user, CharSequence title, private void showEncryptionNotification(UserHandle user, CharSequence title,
CharSequence message, CharSequence detail, PendingIntent intent) { CharSequence message, CharSequence detail, PendingIntent intent) {
if (DEBUG) Slog.v(TAG, "showing encryption notification, user: " + user.getIdentifier());
// Suppress all notifications on non-FBE devices for now
if (!StorageManager.isFileEncryptedNativeOrEmulated()) return;
Notification notification = Notification notification =
new Notification.Builder(mContext, SystemNotificationChannels.DEVICE_ADMIN) new Notification.Builder(mContext, SystemNotificationChannels.DEVICE_ADMIN)
.setSmallIcon(com.android.internal.R.drawable.ic_user_secure) .setSmallIcon(com.android.internal.R.drawable.ic_user_secure)
@@ -728,7 +730,7 @@ public class LockSettingsService extends ILockSettings.Stub {
} }
private void hideEncryptionNotification(UserHandle userHandle) { private void hideEncryptionNotification(UserHandle userHandle) {
if (DEBUG) Slog.v(TAG, "hide encryption notification, user: " + userHandle.getIdentifier()); Slog.d(TAG, "hide encryption notification, user: " + userHandle.getIdentifier());
mNotificationManager.cancelAsUser(null, SystemMessage.NOTE_FBE_ENCRYPTED_NOTIFICATION, mNotificationManager.cancelAsUser(null, SystemMessage.NOTE_FBE_ENCRYPTED_NOTIFICATION,
userHandle); userHandle);
} }
@@ -746,7 +748,7 @@ public class LockSettingsService extends ILockSettings.Stub {
} }
public void onStartUser(final int userId) { public void onStartUser(final int userId) {
maybeShowEncryptionNotificationForUser(userId); maybeShowEncryptionNotificationForUser(userId, "user started");
} }
/** /**
@@ -1497,7 +1499,7 @@ public class LockSettingsService extends ILockSettings.Stub {
if (!alreadyUnlocked) { if (!alreadyUnlocked) {
final long ident = clearCallingIdentity(); final long ident = clearCallingIdentity();
try { try {
maybeShowEncryptionNotificationForUser(profile.id); maybeShowEncryptionNotificationForUser(profile.id, "parent unlocked");
} finally { } finally {
restoreCallingIdentity(ident); restoreCallingIdentity(ident);
} }