Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kathy Chen
2023-05-09 21:46:30 +00:00
committed by Android (Google) Code Review
parent 528cd329f0 b43fbe2aab
commit f415752b8d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java
View File

@@ -60,6 +60,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
/** /**
* System service for managing {@link AmbientContextEvent}s. * System service for managing {@link AmbientContextEvent}s.
@@ -595,7 +596,7 @@ public class AmbientContextManagerService extends
synchronized (mLock) { synchronized (mLock) {
for (ClientRequest cr : mExistingClientRequests) { for (ClientRequest cr : mExistingClientRequests) {
if (cr.getPackageName().equals(callingPackage)) { if ((cr != null) && cr.getPackageName().equals(callingPackage)) {
AmbientContextManagerPerUserService service = AmbientContextManagerPerUserService service =
getAmbientContextManagerPerUserServiceForEventTypes( getAmbientContextManagerPerUserServiceForEventTypes(
UserHandle.getCallingUserId(), UserHandle.getCallingUserId(),