Revert "Improve App notification loading"

Revert "Fix binder error when an app has many channels"

Revert submission 19290255-jr-bind-flicker

Reason for revert: b/240100577
Reverted Changes:
I9a1c96f75:Improve App notification loading
I391ce0b10:Fix binder error when an app has many channels

Change-Id: Iaae40de74d135a79c18201ec17e00f3d9d5f0f3b
This commit is contained in:
Neha Jain
2022-07-25 22:16:16 +00:00
parent e90507373c
commit c5f1cb11e0
34 changed files with 272 additions and 318 deletions

View File

@@ -51,7 +51,7 @@ public class AppBubbleListPreferenceController extends AppConversationListPrefer
private static final String KEY = "bubble_conversations";
public AppBubbleListPreferenceController(Context context, NotificationBackend backend) {
super(context, backend, KEY);
super(context, backend);
}
@Override
@@ -80,25 +80,25 @@ public class AppBubbleListPreferenceController extends AppConversationListPrefer
}
@Override
public int getAvailabilityStatus() {
public boolean isAvailable() {
// copy rather than inherit super's isAvailable because apps can link to this page
// as part of onboarding, before they send a valid conversation notification
if (mAppRow == null) {
return CONDITIONALLY_UNAVAILABLE;
return false;
}
if (mAppRow.banned) {
return CONDITIONALLY_UNAVAILABLE;
return false;
}
if (mChannel != null) {
if (mBackend.onlyHasDefaultChannel(mAppRow.pkg, mAppRow.uid)
|| NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId())) {
return CONDITIONALLY_UNAVAILABLE;
return false;
}
}
if (mAppRow.bubblePreference == BUBBLE_PREFERENCE_NONE) {
return CONDITIONALLY_UNAVAILABLE;
return false;
}
return AVAILABLE;
return true;
}
@VisibleForTesting