Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50aa95ee authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove unused LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS usage" into... 

Merge "Remove unused LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS usage" into tm-qpr-dev am: 68ec906e am: 94bf9d70

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



Change-Id: Iaf16cf599175d197fc031d729d636759ec749a18
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7c11fb0 94bf9d70

packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -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) {