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

Change-Id: I76faa08f32a5944429a6db854e01435b44eb1f34
2019-12-24 23:17:05 +00:00
parent ad929e93e2 d675648673
commit cd78786866
1 changed files with 2 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -2935,7 +2935,9 @@ public final class ActiveServices {
                    } catch (Exception e) {
                        Slog.w(TAG, "Exception when unbinding service "
                                + r.shortInstanceName, e);
+                        needOomAdj = false;
                        serviceProcessGoneLocked(r);
+                        break;
                    }
                }
            }