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

Merge "Fix NPE in AmbientContextManagerService."

Browse Source
This commit is contained in:
Charlie Wang
2023-01-26 03:55:18 +00:00
committed by Android (Google) Code Review
parent 90c5577f0e ae2a24196f
commit 5c85be467c
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -593,16 +593,19 @@ public class AmbientContextManagerService extends
Manifest.permission.ACCESS_AMBIENT_CONTEXT_EVENT, TAG);
assertCalledByPackageOwner(callingPackage);
for (ClientRequest cr : mExistingClientRequests) {
if (cr.getPackageName().equals(callingPackage)) {
AmbientContextManagerPerUserService service =
getAmbientContextManagerPerUserServiceForEventTypes(
UserHandle.getCallingUserId(), cr.getRequest().getEventTypes());
if (service != null) {
service.onUnregisterObserver(callingPackage);
} else {
Slog.w(TAG, "onUnregisterObserver unavailable user_id: "
+ UserHandle.getCallingUserId());
synchronized (mLock) {
for (ClientRequest cr : mExistingClientRequests) {
if (cr.getPackageName().equals(callingPackage)) {
AmbientContextManagerPerUserService service =
getAmbientContextManagerPerUserServiceForEventTypes(
UserHandle.getCallingUserId(),
cr.getRequest().getEventTypes());
if (service != null) {
service.onUnregisterObserver(callingPackage);
} else {
Slog.w(TAG, "onUnregisterObserver unavailable user_id: "
+ UserHandle.getCallingUserId());
}
}
}
}