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

Fix incorrect Settings assumption

Browse Source 
Most apps will not have 4 bundle channels, even when
the flag is on

Test: BundleListPreferenceControllerTest
Fixes: 375674236
Flag: android.service.notification.notification_classification
Change-Id: Iab8e241881f9af71744b46fce356604cf9ed369c
This commit is contained in:
Julia Reynolds
2024-10-28 09:47:02 -04:00
parent 75e2dc4b21
commit 451bd65471
2 changed files with 52 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/notification/app/BundleListPreferenceController.java
View File

@@ -91,14 +91,27 @@ public class BundleListPreferenceController extends NotificationPreferenceContro
public void updateState(Preference preference) {
PreferenceCategory category = (PreferenceCategory) preference;
createOrUpdatePrefForChannel(category,
mBackend.getChannel(mAppRow.pkg, mAppRow.uid, PROMOTIONS_ID));
createOrUpdatePrefForChannel(category,
mBackend.getChannel(mAppRow.pkg, mAppRow.uid, RECS_ID));
createOrUpdatePrefForChannel(category,
mBackend.getChannel(mAppRow.pkg, mAppRow.uid, SOCIAL_MEDIA_ID));
createOrUpdatePrefForChannel(category,
mBackend.getChannel(mAppRow.pkg, mAppRow.uid, NEWS_ID));
NotificationChannel promos = mBackend.getChannel(mAppRow.pkg, mAppRow.uid, PROMOTIONS_ID);
if (promos != null) {
createOrUpdatePrefForChannel(category, promos);
}
NotificationChannel recs = mBackend.getChannel(mAppRow.pkg, mAppRow.uid, RECS_ID);
if (recs != null) {
createOrUpdatePrefForChannel(category, recs);
}
NotificationChannel social = mBackend.getChannel(mAppRow.pkg, mAppRow.uid, SOCIAL_MEDIA_ID);
if (social != null) {
createOrUpdatePrefForChannel(category, social);
}
NotificationChannel news = mBackend.getChannel(mAppRow.pkg, mAppRow.uid, NEWS_ID);
if (news != null) {
createOrUpdatePrefForChannel(category, news);
}
int preferenceCount = ((PreferenceGroup) preference).getPreferenceCount();
if (preferenceCount == 0) {
preference.setVisible(false);
}
}
@NonNull
@@ -167,5 +180,4 @@ public class BundleListPreferenceController extends NotificationPreferenceContro
icon.setTintList(Utils.getColorAccent(mContext));
return icon;
}
}