Merge "Avoid NPE in system_server in bringDownServiceLocked()"

am: 967232eef3 Change-Id: I6ddb38104769ec9e9448c32f55046bc05c709fff
2019-12-24 15:04:32 -08:00
parent 5c351eb894 967232eef3
commit d675648673
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;
                    }
                }
            }