PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some crashes in notification history

Browse Source 
- Can't remove from a fixed size list
- Not everyone likes USER_ALL

Test: manual
Fixes: 149937911
Fixes: 149841327
Change-Id: Ia732522f65138fbcefed5d7c4f2c1e88455a8d1f
This commit is contained in:
Julia Reynolds
2020-02-20 16:08:33 -05:00
parent ea74ce990e
commit 0678b84adf
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/notification/history/NotificationHistoryActivity.java
View File

@@ -51,6 +51,7 @@ import com.android.settings.R;
import com.android.settings.notification.NotificationBackend; import com.android.settings.notification.NotificationBackend;
import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBar;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
public class NotificationHistoryActivity extends Activity { public class NotificationHistoryActivity extends Activity {
@@ -252,7 +253,7 @@ public class NotificationHistoryActivity extends Activity {
rv.setNestedScrollingEnabled(false); rv.setNestedScrollingEnabled(false);
((NotificationSbnAdapter) rv.getAdapter()).onRebuildComplete( ((NotificationSbnAdapter) rv.getAdapter()).onRebuildComplete(
Arrays.asList(snoozed)); new ArrayList<>(Arrays.asList(snoozed)));
} }
try { try {
@@ -268,7 +269,7 @@ public class NotificationHistoryActivity extends Activity {
rv.setNestedScrollingEnabled(false); rv.setNestedScrollingEnabled(false);
((NotificationSbnAdapter) rv.getAdapter()).onRebuildComplete( ((NotificationSbnAdapter) rv.getAdapter()).onRebuildComplete(
Arrays.asList(dismissed)); new ArrayList<>(Arrays.asList(dismissed)));
mDismissView.setVisibility(View.VISIBLE); mDismissView.setVisibility(View.VISIBLE);
} catch (Exception e) { } catch (Exception e) {
Slog.e(TAG, "Cannot load recently dismissed", e); Slog.e(TAG, "Cannot load recently dismissed", e);

21
src/com/android/settings/notification/history/NotificationSbnAdapter.java
View File

@@ -17,6 +17,8 @@
package com.android.settings.notification.history; package com.android.settings.notification.history;
import static android.content.pm.PackageManager.*; import static android.content.pm.PackageManager.*;
import static android.os.UserHandle.USER_ALL;
import static android.os.UserHandle.USER_CURRENT;
import android.app.Notification; import android.app.Notification;
import android.content.Context; import android.content.Context;
@@ -77,12 +79,13 @@ public class NotificationSbnAdapter extends
holder.setTitle(getTitleString(sbn.getNotification())); holder.setTitle(getTitleString(sbn.getNotification()));
holder.setSummary(getTextString(mContext, sbn.getNotification())); holder.setSummary(getTextString(mContext, sbn.getNotification()));
holder.setPostedTime(sbn.getPostTime()); holder.setPostedTime(sbn.getPostTime());
if (!mUserBadgeCache.containsKey(sbn.getUserId())) { int userId = normalizeUserId(sbn);
if (!mUserBadgeCache.containsKey(userId)) {
Drawable profile = mContext.getPackageManager().getUserBadgeForDensity( Drawable profile = mContext.getPackageManager().getUserBadgeForDensity(
UserHandle.of(sbn.getUserId()), -1); UserHandle.of(userId), -1);
mUserBadgeCache.put(sbn.getUserId(), profile); mUserBadgeCache.put(userId, profile);
} }
holder.setProfileBadge(mUserBadgeCache.get(sbn.getUserId())); holder.setProfileBadge(mUserBadgeCache.get(userId));
} else { } else {
Slog.w(TAG, "null entry in list at position " + position); Slog.w(TAG, "null entry in list at position " + position);
} }
@@ -153,7 +156,7 @@ public class NotificationSbnAdapter extends
private Drawable loadIcon(StatusBarNotification sbn) { private Drawable loadIcon(StatusBarNotification sbn) {
Drawable draw = sbn.getNotification().getSmallIcon().loadDrawableAsUser( Drawable draw = sbn.getNotification().getSmallIcon().loadDrawableAsUser(
sbn.getPackageContext(mContext), sbn.getUserId()); sbn.getPackageContext(mContext), normalizeUserId(sbn));
if (draw == null) { if (draw == null) {
return null; return null;
} }
@@ -161,4 +164,12 @@ public class NotificationSbnAdapter extends
draw.setColorFilter(sbn.getNotification().color, PorterDuff.Mode.SRC_ATOP); draw.setColorFilter(sbn.getNotification().color, PorterDuff.Mode.SRC_ATOP);
return draw; return draw;
} }
private int normalizeUserId(StatusBarNotification sbn) {
int userId = sbn.getUserId();
if (userId == USER_ALL) {
userId = USER_CURRENT;
}
return userId;
}
} }