Merge "Avoid NPE in system_server in bringDownServiceLocked()" am: 967232eef3 am: d675648673 am: cd78786866

Change-Id: I3f6f0f0c125c0c514714b38b24fbb83e935d33d0

1 files changed, 2 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index dab928a58011..154d16f013db 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -2960,7 +2960,9 @@ public final class ActiveServices {
                     } catch (Exception e) {
                         Slog.w(TAG, "Exception when unbinding service "
                                 + r.shortInstanceName, e);
+                        needOomAdj = false;
                         serviceProcessGoneLocked(r);
+                        break;
                     }
                 }
             }