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

Commit 3b80554c authored by Kathy Chen's avatar Kathy Chen Committed by Automerger Merge Worker
Browse files

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

Merge "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.""" into udc-dev am: f415752b am: bc6df7e7

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



Change-Id: I9b67cf8e2f1f702d2dc2da5405b41c6a70e05fa7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ac1fb19 bc6df7e7

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(),