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

Merge "Fix bugs found during cts test." into tm-dev am: 761bb05aaa

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17489934

Change-Id: I84aa5b1df7ecca053f9263da4e99ec5e5d30e92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kathy Chen
2022-03-30 15:43:14 +00:00
committed by Automerger Merge Worker
parent 31c1a83c85 761bb05aaa
commit 68481de496
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/ambientcontext/AmbientContextManagerPerUserService.java
View File

@@ -217,9 +217,13 @@ final class AmbientContextManagerPerUserService extends
RemoteCallback detectionResultCallback, RemoteCallback statusCallback) { RemoteCallback detectionResultCallback, RemoteCallback statusCallback) {
Slog.d(TAG, "Requested detection of " + request.getEventTypes()); Slog.d(TAG, "Requested detection of " + request.getEventTypes());
synchronized (mLock) { synchronized (mLock) {
if (setUpServiceIfNeeded()) {
ensureRemoteServiceInitiated(); ensureRemoteServiceInitiated();
mRemoteService.startDetection(request, callingPackage, detectionResultCallback, mRemoteService.startDetection(request, callingPackage, detectionResultCallback,
statusCallback); statusCallback);
} else {
Slog.w(TAG, "No valid component found for AmbientContextDetectionService");
}
} }
} }
@@ -371,10 +375,12 @@ final class AmbientContextManagerPerUserService extends
void stopDetection(String packageName) { void stopDetection(String packageName) {
Slog.d(TAG, "Stop detection for " + packageName); Slog.d(TAG, "Stop detection for " + packageName);
synchronized (mLock) { synchronized (mLock) {
if (mComponentName != null) {
ensureRemoteServiceInitiated(); ensureRemoteServiceInitiated();
mRemoteService.stopDetection(packageName); mRemoteService.stopDetection(packageName);
} }
} }
}
@Nullable @Nullable
private PendingIntent findExistingRequestByPackage(String callingPackage) { private PendingIntent findExistingRequestByPackage(String callingPackage) {

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

@@ -249,6 +249,8 @@ public class AmbientContextManagerService extends
Objects.requireNonNull(eventTypes); Objects.requireNonNull(eventTypes);
Objects.requireNonNull(callingPackage); Objects.requireNonNull(callingPackage);
assertCalledByPackageOwner(callingPackage); assertCalledByPackageOwner(callingPackage);
mContext.enforceCallingOrSelfPermission(
Manifest.permission.ACCESS_AMBIENT_CONTEXT_EVENT, TAG);
mService.onStartConsentActivity(eventTypes, callingPackage); mService.onStartConsentActivity(eventTypes, callingPackage);
} }