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

Commit 533484fa authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Remove a stopship" into rvc-dev am: 7334f951 am: a683a728 

Change-Id: Iba068cdd9a73bea9e80ab6e6abaab886890144a1
parents 74822a35 a683a728

services/core/java/com/android/server/notification/PreferencesHelper.java

+0 −15
Original line number Original line Diff line number Diff line
@@ -166,13 +166,6 @@ public class PreferencesHelper implements RankingConfig { 




    private boolean mAllowInvalidShortcuts = false;

    private boolean mAllowInvalidShortcuts = false;





    private static final String BADGING_FORCED_TRUE = "force_badging_true_for_bug";



    // STOPSHIP (b/142218092) this should be removed before ship

    static boolean wasBadgingForcedTrue(Context context) {

        return Settings.Secure.getInt(context.getContentResolver(), BADGING_FORCED_TRUE, 0) != 0;

    }



    public PreferencesHelper(Context context, PackageManager pm, RankingHandler rankingHandler,

    public PreferencesHelper(Context context, PackageManager pm, RankingHandler rankingHandler,

            ZenModeHelper zenHelper, NotificationChannelLogger notificationChannelLogger,

            ZenModeHelper zenHelper, NotificationChannelLogger notificationChannelLogger,

            AppOpsManager appOpsManager) {

            AppOpsManager appOpsManager) {
@@ -183,14 +176,6 @@ public class PreferencesHelper implements RankingConfig { 
        mNotificationChannelLogger = notificationChannelLogger;

        mNotificationChannelLogger = notificationChannelLogger;

        mAppOps = appOpsManager;

        mAppOps = appOpsManager;





        // STOPSHIP (b/142218092) this should be removed before ship

        if (!wasBadgingForcedTrue(context)) {

            Settings.Secure.putInt(mContext.getContentResolver(),

                    Settings.Secure.NOTIFICATION_BADGING,

                    DEFAULT_SHOW_BADGE ? 1 : 0);

            Settings.Secure.putInt(context.getContentResolver(), BADGING_FORCED_TRUE, 1);

        }



        updateBadgingEnabled();

        updateBadgingEnabled();

        updateBubblesEnabled();

        updateBubblesEnabled();

        syncChannelsBypassingDnd(mContext.getUserId());

        syncChannelsBypassingDnd(mContext.getUserId());