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

Merge "SystemUI: Fix crash from bad notifications" into nyc-mr1-dev

Browse Source
This commit is contained in:
Adrian Roos
2016-08-02 18:40:41 +00:00
committed by Android (Google) Code Review
parent 9923784efc 95f8bea461
commit 87fab000c5
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -961,7 +961,6 @@ public abstract class BaseStatusBar extends SystemUI implements
mNotificationGutsExposed = entry.row.getGuts();
bindGuts(entry.row);
}
entry.cacheContentViews(mContext, null /* updatedNotification */);
inflateViews(entry, mStackScroller);
}
}
@@ -1585,7 +1584,12 @@ public abstract class BaseStatusBar extends SystemUI implements
entry.notification.getUser().getIdentifier());
final StatusBarNotification sbn = entry.notification;
entry.cacheContentViews(mContext, null);
try {
entry.cacheContentViews(mContext, null);
} catch (RuntimeException e) {
Log.e(TAG, "Unable to get notification remote views", e);
return false;
}
final RemoteViews contentView = entry.cachedContentView;
final RemoteViews bigContentView = entry.cachedBigContentView;
@@ -2354,7 +2358,13 @@ public abstract class BaseStatusBar extends SystemUI implements
Notification n = notification.getNotification();
mNotificationData.updateRanking(ranking);
boolean applyInPlace = entry.cacheContentViews(mContext, notification.getNotification());
boolean applyInPlace;
try {
applyInPlace = entry.cacheContentViews(mContext, notification.getNotification());
} catch (RuntimeException e) {
Log.e(TAG, "Unable to get notification remote views", e);
applyInPlace = false;
}
boolean shouldPeek = shouldPeek(entry, notification);
boolean alertAgain = alertAgain(entry, n);
if (DEBUG) {
@@ -2406,7 +2416,10 @@ public abstract class BaseStatusBar extends SystemUI implements
StatusBarIconView.contentDescForNotification(mContext, n));
entry.icon.setNotification(n);
entry.icon.set(ic);
inflateViews(entry, mStackScroller);
if (!inflateViews(entry, mStackScroller)) {
handleNotificationError(notification, "Couldn't update remote views for: "
+ notification);
}
}
updateHeadsUp(key, entry, shouldPeek, alertAgain);
updateNotifications();