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

Commit b43fbe2a authored by Kathy Chen's avatar Kathy Chen
Browse files

Revert "Revert "[AC] Fix NPE. If the client sends multiple unregister requests... 

Revert "Revert "[AC] Fix NPE. If the client sends multiple unregister requests at the same time, the client request could be null before the next request is processed.""

This reverts commit f470e292.

Reason for revert: Fixed warning from presubmit

Change-Id: I3e1ea17a2e149b548885666d9e8418647b96439e
(cherry picked from commit b93d2ce0)
Bug: 278891267
Test: make
parent 7981d137

services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import java.util.HashSet; 
import java.util.List;

import java.util.Objects;

import java.util.Set;

import java.util.concurrent.ConcurrentHashMap;



/**

 * System service for managing {@link AmbientContextEvent}s.
@@ -595,7 +596,7 @@ public class AmbientContextManagerService extends 


            synchronized (mLock) {

                for (ClientRequest cr : mExistingClientRequests) {

                    if (cr.getPackageName().equals(callingPackage)) {

                    if ((cr != null) && cr.getPackageName().equals(callingPackage)) {

                        AmbientContextManagerPerUserService service =

                                getAmbientContextManagerPerUserServiceForEventTypes(

                                        UserHandle.getCallingUserId(),