Merge "Don't crash sysui when advisory calls fail." into mnc-dev

cwren · Android (Google) Code Review · commit db2b4ba69db3 · 2015-07-22T21:18:40.000Z
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -729,11 +729,15 @@ public boolean isNotificationForCurrentProfiles(StatusBarNotification n) {
     }
 
     protected void setNotificationShown(StatusBarNotification n) {
-        mNotificationListener.setNotificationsShown(new String[] { n.getKey() });
+        setNotificationsShown(new String[]{n.getKey()});
     }
 
     protected void setNotificationsShown(String[] keys) {
-        mNotificationListener.setNotificationsShown(keys);
+        try {
+            mNotificationListener.setNotificationsShown(keys);
+        } catch (RuntimeException e) {
+            Log.d(TAG, "failed setNotificationsShown: ", e);
+        }
     }
 
     protected boolean isCurrentProfile(int userId) {

Original file line number	Diff line number	Diff line change
`@@ -729,11 +729,15 @@ public boolean isNotificationForCurrentProfiles(StatusBarNotification n) {`
`729`	`729`	`}`
`730`	`730`
`731`	`731`	`protected void setNotificationShown(StatusBarNotification n) {`
`732`		`- mNotificationListener.setNotificationsShown(new String[] { n.getKey() });`
	`732`	`+ setNotificationsShown(new String[]{n.getKey()});`
`733`	`733`	`}`
`734`	`734`
`735`	`735`	`protected void setNotificationsShown(String[] keys) {`
`736`		`- mNotificationListener.setNotificationsShown(keys);`
	`736`	`+ try {`
	`737`	`+ mNotificationListener.setNotificationsShown(keys);`
	`738`	`+ } catch (RuntimeException e) {`
	`739`	`+ Log.d(TAG, "failed setNotificationsShown: ", e);`
	`740`	`+ }`
`737`	`741`	`}`
`738`	`742`
`739`	`743`	`protected boolean isCurrentProfile(int userId) {`