Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee3bbefd authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

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

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

services/java/com/android/server/am/ServiceRecord.java

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.os.Binder; 
import android.os.IBinder;

import android.os.RemoteException;

import android.os.SystemClock;

import android.util.Log;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -267,6 +268,9 @@ class ServiceRecord extends Binder { 
                        int[] outId = new int[1];

                        inm.enqueueNotification(localPackageName, localForegroundId,

                                localForegroundNoti, outId);

                    } catch (RuntimeException e) {

                        Log.w(ActivityManagerService.TAG, "Error showing notification for service",

                            e);

                    } catch (RemoteException e) {

                    }

                }
@@ -288,6 +292,9 @@ class ServiceRecord extends Binder { 
                    }

                    try {

                        inm.cancelNotification(localPackageName, localForegroundId);

                    } catch (RuntimeException e) {

                        Log.w(ActivityManagerService.TAG, "Error canceling notification for"

                            + " service", e);

                    } catch (RemoteException e) {

                    }

                }