From 7b12c38524a60d7c4a42be2d5b1677392e001c13 Mon Sep 17 00:00:00 2001 From: Sergey Nikolaienkov Date: Tue, 30 Nov 2021 19:49:28 +0100 Subject: [PATCH] Fix checkUsesFeature() in CdmService Bug: 208258862 Test: make, flash, monitor logcat Test: atest CtsCompanionDevicesTestCases Change-Id: I3780f8171b7fc5b77c811b5683d0e01742a392dd --- .../server/companion/CompanionDeviceManagerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index f8be1656b3eed..b817dee11d279 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -23,6 +23,7 @@ import static android.bluetooth.le.ScanSettings.SCAN_MODE_BALANCED; import static android.content.pm.PackageManager.CERT_INPUT_SHA256; import static android.content.pm.PackageManager.FEATURE_COMPANION_DEVICE_SETUP; import static android.content.pm.PackageManager.PERMISSION_GRANTED; +import static android.os.Binder.getCallingUid; import static android.os.Process.SYSTEM_UID; import static android.os.UserHandle.getCallingUserId; @@ -1257,7 +1258,7 @@ public class CompanionDeviceManagerService extends SystemService { } void checkUsesFeature(@NonNull String pkg, @UserIdInt int userId) { - if (getCallingUserId() == SYSTEM_UID) return; + if (getCallingUid() == SYSTEM_UID) return; final FeatureInfo[] requestedFeatures = getPackageInfo(pkg, userId).reqFeatures; if (requestedFeatures != null) {