diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-23 16:55:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 16:55:22 -0700 |
| commit | 982c07e908c4cb66db224ccfd0810bf8bd449835 (patch) | |
| tree | 77dca2699bb14a30155083611f77430f558011b3 | |
| parent | 1e2df14a85f098d63b618531db733a21429d4037 (diff) | |
| parent | cbb7b05e35368b104c27089f5f16640680f567c2 (diff) | |
| download | frameworks_base-982c07e908c4cb66db224ccfd0810bf8bd449835.zip frameworks_base-982c07e908c4cb66db224ccfd0810bf8bd449835.tar.gz frameworks_base-982c07e908c4cb66db224ccfd0810bf8bd449835.tar.bz2 | |
am cbb7b05e: Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread
Merge commit 'cbb7b05e35368b104c27089f5f16640680f567c2' into gingerbread-plus-aosp
* commit 'cbb7b05e35368b104c27089f5f16640680f567c2':
Crash apps when they provide bad notifications instead of crashing the system process.
| -rw-r--r-- | services/java/com/android/server/am/ServiceRecord.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ServiceRecord.java b/services/java/com/android/server/am/ServiceRecord.java index f35a68e..e5aceb4 100644 --- a/services/java/com/android/server/am/ServiceRecord.java +++ b/services/java/com/android/server/am/ServiceRecord.java @@ -347,7 +347,9 @@ class ServiceRecord extends Binder { // If it gave us a garbage notification, it doesn't // get to be foreground. ams.setServiceForeground(name, ServiceRecord.this, - localForegroundId, null, true); + 0, null, true); + ams.crashApplication(appUid, appPid, localPackageName, + "Bad notification for startForeground: " + e); } } }); |