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

Merge "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.""

Browse Source
This commit is contained in:
Kathy Chen
2023-05-08 23:01:06 +00:00
committed by Android (Google) Code Review
parent 3ee14cf715 f470e292d8
commit efa32a9b8f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,11 +56,11 @@ import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.concurrent.ConcurrentHashMap;
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.
@@ -600,7 +600,7 @@ public class AmbientContextManagerService extends
unregisterObserver_enforcePermission();
assertCalledByPackageOwner(callingPackage);
synchronized (mExistingClientRequests) {
synchronized (mLock) {
for (ClientRequest cr : mExistingClientRequests) {
if (cr.getPackageName().equals(callingPackage)) {
AmbientContextManagerPerUserService service =