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

Commit 973bc216 authored by Mady Mellor's avatar Mady Mellor
Browse files

Force badging to be true 

Bug: 142218092
Test: 1) have a device on the build with the bug (flame QQ1A.191003.003 5918574)
      2) send a notificaition with bubbles test app or notify, observe no dots
         show on launcher icon
      3) flash a build with this change to the device (no wipe)
      4) repeat step 2 but observe that dots show on launcher icons
      5) go into settings, disable notification badging, reboot device, observe
         that setting is respected (i.e. dots don't show)
Change-Id: I249bb683e816e62361df4526831341ce7b0ef2b7
parent 2bbe7de4

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

+15 −0
Original line number Diff line number Diff line
@@ -138,6 +138,13 @@ public class PreferencesHelper implements RankingConfig { 
    private boolean mAreChannelsBypassingDnd;

    private boolean mHideSilentStatusBarIcons = DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS;



    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,

            ZenModeHelper zenHelper) {

        mContext = context;
@@ -145,6 +152,14 @@ public class PreferencesHelper implements RankingConfig { 
        mRankingHandler = rankingHandler;

        mPm = pm;



        // 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();

        updateBubblesEnabled();

        syncChannelsBypassingDnd(mContext.getUserId());