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

Commit 887d8086 authored by Gopal Krishna Shukla's avatar Gopal Krishna Shukla Committed by Jing Ji
Browse files

Avoid NPE in system_server in bringDownServiceLocked() 

While stoping the service is scheduleUnbindService()
is failing with exception , no need to update the OOM
value of the process as processRecord is already set
to NULL.

Test: Monkey or directed (see bug)
Bug: 136627142
Change-Id: Ic766b91e6dc47b8ff727026863bab2437f9be420
parent 4bdfc3c0

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;

                    }

                }

            }