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

Merge "Remove unused LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS usage" into tm-qpr-dev am: 68ec906eba

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

Change-Id: I654a26d6b84a16eabf4a4b287b1d3d19e975441e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-10-14 20:23:24 +00:00
committed by Automerger Merge Worker
parent 4416de54d1 68ec906eba
commit 94bf9d70b0
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java
View File

@@ -189,7 +189,6 @@ public class NotificationLockscreenUserManagerImpl implements
protected NotificationPresenter mPresenter; protected NotificationPresenter mPresenter;
protected ContentObserver mLockscreenSettingsObserver; protected ContentObserver mLockscreenSettingsObserver;
protected ContentObserver mSettingsObserver; protected ContentObserver mSettingsObserver;
private boolean mHideSilentNotificationsOnLockscreen;
@Inject @Inject
public NotificationLockscreenUserManagerImpl(Context context, public NotificationLockscreenUserManagerImpl(Context context,
@@ -265,12 +264,6 @@ public class NotificationLockscreenUserManagerImpl implements
mLockscreenSettingsObserver, mLockscreenSettingsObserver,
UserHandle.USER_ALL); UserHandle.USER_ALL);
mContext.getContentResolver().registerContentObserver(
mSecureSettings.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS),
true,
mLockscreenSettingsObserver,
UserHandle.USER_ALL);
mContext.getContentResolver().registerContentObserver( mContext.getContentResolver().registerContentObserver(
Settings.Global.getUriFor(Settings.Global.ZEN_MODE), false, Settings.Global.getUriFor(Settings.Global.ZEN_MODE), false,
mSettingsObserver); mSettingsObserver);
@@ -340,9 +333,6 @@ public class NotificationLockscreenUserManagerImpl implements
final boolean allowedByDpm = (dpmFlags final boolean allowedByDpm = (dpmFlags
& DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS) == 0; & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS) == 0;
mHideSilentNotificationsOnLockscreen = mSecureSettings.getIntForUser(
Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1, mCurrentUserId) == 0;
setShowLockscreenNotifications(show && allowedByDpm); setShowLockscreenNotifications(show && allowedByDpm);
if (ENABLE_LOCK_SCREEN_ALLOW_REMOTE_INPUT) { if (ENABLE_LOCK_SCREEN_ALLOW_REMOTE_INPUT) {