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

[conflict] Move service initialization am: 38fe45b539

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18563202

Change-Id: If27ee7e26bcf2797a6a4a770f2a5064605cdeaa0
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Reynolds
2022-05-26 23:48:11 +00:00
parent e545a5dbbf 38fe45b539
commit 012cace2ee
1 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
services/core/java/com/android/server/notification/NotificationManagerService.java Normal file → Executable file
View File

@@ -1491,6 +1491,53 @@ public class NotificationManagerService extends SystemService {
return out; return out;
} }
protected class StrongAuthTracker extends LockPatternUtils.StrongAuthTracker {
SparseBooleanArray mUserInLockDownMode = new SparseBooleanArray();
boolean mIsInLockDownMode = false;
StrongAuthTracker(Context context) {
super(context);
}
private boolean containsFlag(int haystack, int needle) {
return (haystack & needle) != 0;
}
public boolean isInLockDownMode() {
return mIsInLockDownMode;
}
@Override
public synchronized void onStrongAuthRequiredChanged(int userId) {
boolean userInLockDownModeNext = containsFlag(getStrongAuthForUser(userId),
STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN);
mUserInLockDownMode.put(userId, userInLockDownModeNext);
boolean isInLockDownModeNext = mUserInLockDownMode.indexOfValue(true) != -1;
if (mIsInLockDownMode == isInLockDownModeNext) {
return;
}
if (isInLockDownModeNext) {
cancelNotificationsWhenEnterLockDownMode();
}
// When the mIsInLockDownMode is true, both notifyPostedLocked and
// notifyRemovedLocked will be dismissed. So we shall call
// cancelNotificationsWhenEnterLockDownMode before we set mIsInLockDownMode
// as true and call postNotificationsWhenExitLockDownMode after we set
// mIsInLockDownMode as false.
mIsInLockDownMode = isInLockDownModeNext;
if (!isInLockDownModeNext) {
postNotificationsWhenExitLockDownMode();
}
}
}
private StrongAuthTracker mStrongAuthTracker;
public NotificationManagerService(Context context) { public NotificationManagerService(Context context) {
super(context); super(context);
Notification.processWhitelistToken = WHITELIST_TOKEN; Notification.processWhitelistToken = WHITELIST_TOKEN;
@@ -1672,6 +1719,7 @@ public class NotificationManagerService extends SystemService {
mHandler = new WorkerHandler(looper); mHandler = new WorkerHandler(looper);
mRankingThread.start(); mRankingThread.start();
mStrongAuthTracker = new StrongAuthTracker(getContext());
String[] extractorNames; String[] extractorNames;
try { try {
extractorNames = resources.getStringArray(R.array.config_notificationSignalExtractors); extractorNames = resources.getStringArray(R.array.config_notificationSignalExtractors);
@@ -1957,6 +2005,7 @@ public class NotificationManagerService extends SystemService {
mRoleObserver = new RoleObserver(getContext().getSystemService(RoleManager.class), mRoleObserver = new RoleObserver(getContext().getSystemService(RoleManager.class),
mPackageManager, getContext().getMainExecutor()); mPackageManager, getContext().getMainExecutor());
mRoleObserver.init(); mRoleObserver.init();
new LockPatternUtils(getContext()).registerStrongAuthTracker(mStrongAuthTracker);
} else if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) { } else if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) {
// This observer will force an update when observe is called, causing us to // This observer will force an update when observe is called, causing us to
// bind to listener services. // bind to listener services.