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

[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 
Bug: 278891267
Test: make
Change-Id: I7ff41338ab638ce40ef618bc306cc25f0939f023
This commit is contained in:
Kathy Chen
2023-05-01 11:19:44 -07:00
parent 969649196d
commit 21b89197a9
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 (mLock) {
synchronized (mExistingClientRequests) {
for (ClientRequest cr : mExistingClientRequests) {
if (cr.getPackageName().equals(callingPackage)) {
AmbientContextManagerPerUserService service =