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

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

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

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

Change-Id: I3f6f0f0c125c0c514714b38b24fbb83e935d33d0
parents 2d41a840 cd787868

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -2960,7 +2960,9 @@ public final class ActiveServices { 
                    } catch (Exception e) {

                    } catch (Exception e) {

                        Slog.w(TAG, "Exception when unbinding service "

                        Slog.w(TAG, "Exception when unbinding service "

                                + r.shortInstanceName, e);

                                + r.shortInstanceName, e);

                        needOomAdj = false;

                        serviceProcessGoneLocked(r);

                        serviceProcessGoneLocked(r);

                        break;

                    }

                    }

                }

                }

            }

            }