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

Commit 7bd35262 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Add the missing lock on the process start timeout handling" into tm-dev... 

Merge "Add the missing lock on the process start timeout handling" into tm-dev am: 9bcc7868 am: b558a683

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18242014



Change-Id: Ie289fbaa639982320be07ea9da76ab0fb7926234
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7f3ed3d b558a683

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

+4 −2
Original line number Diff line number Diff line
@@ -2028,8 +2028,10 @@ public final class ProcessList { 
                    mService.mProcessList.handlePredecessorProcDied((ProcessRecord) msg.obj);

                    break;

                case MSG_PROCESS_KILL_TIMEOUT:

                    synchronized (mService) {

                        mService.handleProcessStartOrKillTimeoutLocked((ProcessRecord) msg.obj,

                                /* isKillTimeout */ true);

                    }

                    break;

            }

        }