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

Commit 52d844e6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "Fix for Concurrency issue reported in 525529""

parents 51148a6b d2172cc1

services/java/com/android/server/am/ActivityManagerService.java

+1 −5
Original line number Diff line number Diff line
@@ -1227,11 +1227,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    mHandler.sendMessageDelayed(nmsg, ActiveServices.SERVICE_TIMEOUT);

                    return;

                }

                //synchronising to avoid proc.executingServices set

                //getting updated while being iterated in serviceTimeout()

                synchronized(ActivityManagerService.this){

                mServices.serviceTimeout((ProcessRecord)msg.obj);

                }

            } break;

            case UPDATE_TIME_ZONE: {

                synchronized (ActivityManagerService.this) {