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

Commit efa32a9b authored by Kathy Chen's avatar Kathy Chen Committed by Android (Google) Code Review
Browse files

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

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.""
parents 3ee14cf7 f470e292

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -56,11 +56,11 @@ import java.io.FileDescriptor; 
import java.io.PrintWriter;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Arrays;

import java.util.concurrent.ConcurrentHashMap;

import java.util.HashSet;

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.
@@ -600,7 +600,7 @@ public class AmbientContextManagerService extends 
            unregisterObserver_enforcePermission();

            unregisterObserver_enforcePermission();

            assertCalledByPackageOwner(callingPackage);

            assertCalledByPackageOwner(callingPackage);





            synchronized (mExistingClientRequests) {

            synchronized (mLock) {

                for (ClientRequest cr : mExistingClientRequests) {

                for (ClientRequest cr : mExistingClientRequests) {

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

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

                        AmbientContextManagerPerUserService service =

                        AmbientContextManagerPerUserService service =