From a925cd4101dceefae6b9c0634084f9fa72b12344 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Thu, 10 Mar 2011 13:18:20 -0800 Subject: Fix issue #4081756: Crash when un-stopping applications Change-Id: Ifc23481f8feaeacb410375eefd015ebdb997e39c --- .../com/android/server/am/ActivityManagerService.java | 18 ++++++++++++++++++ services/java/com/android/server/am/ActivityStack.java | 3 +++ 2 files changed, 21 insertions(+) diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 0fab964b5fd8..6d44bb561de4 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -3151,6 +3151,9 @@ public final class ActivityManagerService extends ActivityManagerNative try { pm.setPackageStoppedState(packageName, true); } catch (RemoteException e) { + } catch (IllegalArgumentException e) { + Slog.w(TAG, "Failed trying to unstop package " + + packageName + ": " + e); } } } finally { @@ -5559,6 +5562,9 @@ public final class ActivityManagerService extends ActivityManagerNative AppGlobals.getPackageManager().setPackageStoppedState( cpr.appInfo.packageName, false); } catch (RemoteException e) { + } catch (IllegalArgumentException e) { + Slog.w(TAG, "Failed trying to unstop package " + + cpr.appInfo.packageName + ": " + e); } ProcessRecord proc = startProcessLocked(cpi.processName, @@ -5840,6 +5846,9 @@ public final class ActivityManagerService extends ActivityManagerNative AppGlobals.getPackageManager().setPackageStoppedState( info.packageName, false); } catch (RemoteException e) { + } catch (IllegalArgumentException e) { + Slog.w(TAG, "Failed trying to unstop package " + + info.packageName + ": " + e); } if ((info.flags&(ApplicationInfo.FLAG_SYSTEM|ApplicationInfo.FLAG_PERSISTENT)) @@ -9396,6 +9405,9 @@ public final class ActivityManagerService extends ActivityManagerNative AppGlobals.getPackageManager().setPackageStoppedState( r.packageName, false); } catch (RemoteException e) { + } catch (IllegalArgumentException e) { + Slog.w(TAG, "Failed trying to unstop package " + + r.packageName + ": " + e); } final String appName = r.processName; @@ -10297,6 +10309,9 @@ public final class ActivityManagerService extends ActivityManagerNative AppGlobals.getPackageManager().setPackageStoppedState( app.packageName, false); } catch (RemoteException e) { + } catch (IllegalArgumentException e) { + Slog.w(TAG, "Failed trying to unstop package " + + app.packageName + ": " + e); } BackupRecord r = new BackupRecord(ss, app, backupMode); @@ -11625,6 +11640,9 @@ public final class ActivityManagerService extends ActivityManagerNative AppGlobals.getPackageManager().setPackageStoppedState( r.curComponent.getPackageName(), false); } catch (RemoteException e) { + } catch (IllegalArgumentException e) { + Slog.w(TAG, "Failed trying to unstop package " + + r.curComponent.getPackageName() + ": " + e); } // Is this receiver's application already running? diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 3a613bb11bee..c087aecfb594 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -1299,6 +1299,9 @@ public class ActivityStack { AppGlobals.getPackageManager().setPackageStoppedState( next.packageName, false); } catch (RemoteException e1) { + } catch (IllegalArgumentException e) { + Slog.w(TAG, "Failed trying to unstop package " + + next.packageName + ": " + e); } // We are starting up the next activity, so tell the window manager -- cgit v1.2.3-59-g8ed1b