Merge "Remove unused LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS usage" into tm-qpr-dev am: 68ec906eba am: 94bf9d70b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20191012 Change-Id: Iaf16cf599175d197fc031d729d636759ec749a18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -189,7 +189,6 @@ public class NotificationLockscreenUserManagerImpl implements
|
||||
protected NotificationPresenter mPresenter;
|
||||
protected ContentObserver mLockscreenSettingsObserver;
|
||||
protected ContentObserver mSettingsObserver;
|
||||
private boolean mHideSilentNotificationsOnLockscreen;
|
||||
|
||||
@Inject
|
||||
public NotificationLockscreenUserManagerImpl(Context context,
|
||||
@@ -265,12 +264,6 @@ public class NotificationLockscreenUserManagerImpl implements
|
||||
mLockscreenSettingsObserver,
|
||||
UserHandle.USER_ALL);
|
||||
|
||||
mContext.getContentResolver().registerContentObserver(
|
||||
mSecureSettings.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS),
|
||||
true,
|
||||
mLockscreenSettingsObserver,
|
||||
UserHandle.USER_ALL);
|
||||
|
||||
mContext.getContentResolver().registerContentObserver(
|
||||
Settings.Global.getUriFor(Settings.Global.ZEN_MODE), false,
|
||||
mSettingsObserver);
|
||||
@@ -340,9 +333,6 @@ public class NotificationLockscreenUserManagerImpl implements
|
||||
final boolean allowedByDpm = (dpmFlags
|
||||
& DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS) == 0;
|
||||
|
||||
mHideSilentNotificationsOnLockscreen = mSecureSettings.getIntForUser(
|
||||
Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1, mCurrentUserId) == 0;
|
||||
|
||||
setShowLockscreenNotifications(show && allowedByDpm);
|
||||
|
||||
if (ENABLE_LOCK_SCREEN_ALLOW_REMOTE_INPUT) {
|
||||
|
||||
Reference in New Issue
Block a user