From bfac468ce907643eda50afa28f25538b9182e65e Mon Sep 17 00:00:00 2001 From: Wale Ogunwale Date: Wed, 8 Apr 2015 14:33:21 -0700 Subject: [PATCH] Throw caught DeadObjectException when trying to create a service. We don't want to continue trying to start the service if the service appliction is dead. This will lead to an NPE later on since we have set ServiceRecord.app to null in the finally block. Bug: 5227987 Change-Id: I3ee5111f4a20d9455fedbf41ac54d41c43aa8d76 --- services/core/java/com/android/server/am/ActiveServices.java | 1 + services/core/java/com/android/server/am/BroadcastQueue.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index e92443cf9109f..3dece494c2d3f 100755 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -1519,6 +1519,7 @@ public final class ActiveServices { } catch (DeadObjectException e) { Slog.w(TAG, "Application dead when creating service " + r); mAm.appDiedLocked(app); + throw e; } finally { if (!created) { // Keep the executeNesting count accurate. diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java index 34c1c5393195b..5b5ebef46e1fb 100644 --- a/services/core/java/com/android/server/am/BroadcastQueue.java +++ b/services/core/java/com/android/server/am/BroadcastQueue.java @@ -50,7 +50,7 @@ import static com.android.server.am.ActivityManagerDebugConfig.*; * foreground priority, and one for normal (background-priority) broadcasts. */ public final class BroadcastQueue { - private static final String TAG = TAG_WITH_CLASS_NAME ? "BroadcastQueue" : TAG_AM; + private static final String TAG = "BroadcastQueue"; private static final String TAG_MU = TAG + POSTFIX_MU; private static final String TAG_BROADCAST = TAG + POSTFIX_BROADCAST;