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

Merge "Fix 1667521 - system process crash after bad notification"

Browse Source
This commit is contained in:
Joe Onorato
2010-02-03 20:25:43 -08:00
committed by Android (Google) Code Review
parent fa6bc84e01 68065e0a19
commit f1dd37ac28
4 changed files with 65 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/status/NotificationData.java
View File

@@ -19,7 +19,7 @@ public class NotificationData {
public PendingIntent deleteIntent;
public String toString() {
return "NotificationData(package=" + pkg + " tickerText=" + tickerText
return "NotificationData(package=" + pkg + " id=" + id + " tickerText=" + tickerText
+ " ongoingEvent=" + ongoingEvent + " contentIntent=" + contentIntent
+ " deleteIntent=" + deleteIntent
+ " clearable=" + clearable

30
services/java/com/android/server/status/NotificationViewList.java
View File

@@ -104,10 +104,25 @@ class NotificationViewList {
return null;
}
// gets the index of the notification in its expanded parent view
// gets the index of the notification's view in its expanded parent view
int getExpandedIndex(StatusBarNotification notification) {
ArrayList<StatusBarNotification> list = notification.data.ongoingEvent ? mOngoing : mLatest;
return list.size() - indexForKey(list, notification.key) - 1;
final IBinder key = notification.key;
int index = 0;
// (the view order is backwards from this list order)
for (int i=list.size()-1; i>=0; i--) {
StatusBarNotification item = list.get(i);
if (item.key == key) {
return index;
}
if (item.view != null) {
index++;
}
}
Log.e(StatusBarService.TAG, "Couldn't find notification in NotificationViewList.");
Log.e(StatusBarService.TAG, "notification=" + notification);
dump(notification);
return 0;
}
void clearViews() {
@@ -155,6 +170,13 @@ class NotificationViewList {
}
list.add(index, notification);
if (StatusBarService.SPEW) {
Log.d(StatusBarService.TAG, "NotificationViewList index=" + index);
dump(notification);
}
}
void dump(StatusBarNotification notification) {
if (StatusBarService.SPEW) {
String s = "";
for (int i=0; i<mOngoing.size(); i++) {
@@ -168,7 +190,7 @@ class NotificationViewList {
}
s += " ";
}
Log.d(StatusBarService.TAG, "NotificationViewList ongoing index=" + index + ": " + s);
Log.d(StatusBarService.TAG, "NotificationViewList ongoing: " + s);
s = "";
for (int i=0; i<mLatest.size(); i++) {
@@ -182,7 +204,7 @@ class NotificationViewList {
}
s += " ";
}
Log.d(StatusBarService.TAG, "NotificationViewList latest index=" + index + ": " + s);
Log.d(StatusBarService.TAG, "NotificationViewList latest: " + s);
}
}

3
services/java/com/android/server/status/StatusBarService.java
View File

@@ -886,7 +886,8 @@ public class StatusBarService extends IStatusBar.Stub
&& n.contentView.getPackage() != null
&& oldData.contentView.getPackage() != null
&& oldData.contentView.getPackage().equals(n.contentView.getPackage())
&& oldData.contentView.getLayoutId() == n.contentView.getLayoutId()) {
&& oldData.contentView.getLayoutId() == n.contentView.getLayoutId()
&& notification.view != null) {
mNotificationData.update(notification);
try {
n.contentView.reapply(mContext, notification.contentView);

36
tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java
View File

@@ -121,6 +121,32 @@ public class NotificationTestList extends TestActivity
}
},
new Test("Bad resource #2") {
public void run()
{
Notification n = new Notification(NotificationTestList.this,
R.drawable.ic_statusbar_missedcall,
null, System.currentTimeMillis()-(1000*60*60*24),
"(453) 123-2328",
"", null);
n.contentView.setInt(1 /*bogus*/, "bogus method", 666);
mNM.notify(2, n);
}
},
new Test("Bad resource #3") {
public void run()
{
Notification n = new Notification(NotificationTestList.this,
R.drawable.ic_statusbar_missedcall,
null, System.currentTimeMillis()-(1000*60*60*24),
"(453) 123-2328",
"", null);
n.contentView.setInt(1 /*bogus*/, "bogus method", 666);
mNM.notify(3, n);
}
},
new Test("Times") {
public void run()
{
@@ -405,6 +431,16 @@ public class NotificationTestList extends TestActivity
}
},
new Test("Persistent #3") {
public void run() {
Notification n = new Notification(R.drawable.icon2, "tock tock tock",
System.currentTimeMillis());
n.setLatestEventInfo(NotificationTestList.this, "Persistent #3",
"Notify me!!!", makeIntent());
mNM.notify(3, n);
}
},
new Test("Persistent #2 Vibrate") {
public void run() {
Notification n = new Notification(R.drawable.icon2, "tock tock tock",