Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd787868 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Avoid NPE in system_server in bringDownServiceLocked()" am: 967232ee am: d6756486 

Change-Id: I76faa08f32a5944429a6db854e01435b44eb1f34
parents ad929e93 d6756486

services/core/java/com/android/server/am/ActiveServices.java

+2 −0
Original line number Diff line number Diff line
@@ -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;

                    }

                }

            }