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

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

Browse Source 
Change-Id: Ibfdd9d9665eba8957f6942f99ea4b63043b277aa
This commit is contained in:
Mady Mellor
2020-04-30 19:52:38 +00:00
committed by Automerger Merge Worker
parent 0d6dc417c0 7334f95129
commit a683a7288d
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/notification/PreferencesHelper.java
View File

@@ -166,13 +166,6 @@ public class PreferencesHelper implements RankingConfig {
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,
ZenModeHelper zenHelper, NotificationChannelLogger notificationChannelLogger,
AppOpsManager appOpsManager) {
@@ -183,14 +176,6 @@ public class PreferencesHelper implements RankingConfig {
mNotificationChannelLogger = notificationChannelLogger;
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();
updateBubblesEnabled();
syncChannelsBypassingDnd(mContext.getUserId());