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

Merge "Don't crash the system process when apps give us a bad foreground service notification." into eclair

Browse Source
This commit is contained in:
Joe Onorato
2010-02-18 04:46:32 -08:00
committed by Android (Google) Code Review
parent 00b17659bb 34fcf97103
commit ee3bbefd34
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/am/ServiceRecord.java
View File

@@ -29,6 +29,7 @@ import android.os.Binder;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.Log;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
@@ -267,6 +268,9 @@ class ServiceRecord extends Binder {
int[] outId = new int[1]; int[] outId = new int[1];
inm.enqueueNotification(localPackageName, localForegroundId, inm.enqueueNotification(localPackageName, localForegroundId,
localForegroundNoti, outId); localForegroundNoti, outId);
} catch (RuntimeException e) {
Log.w(ActivityManagerService.TAG, "Error showing notification for service",
e);
} catch (RemoteException e) { } catch (RemoteException e) {
} }
} }
@@ -288,6 +292,9 @@ class ServiceRecord extends Binder {
} }
try { try {
inm.cancelNotification(localPackageName, localForegroundId); inm.cancelNotification(localPackageName, localForegroundId);
} catch (RuntimeException e) {
Log.w(ActivityManagerService.TAG, "Error canceling notification for"
+ " service", e);
} catch (RemoteException e) { } catch (RemoteException e) {
} }
} }