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

Fix checkUsesFeature() in CdmService

Browse Source 
Bug: 208258862
Test: make, flash, monitor logcat
Test: atest CtsCompanionDevicesTestCases
Change-Id: I3780f8171b7fc5b77c811b5683d0e01742a392dd
This commit is contained in:
Sergey Nikolaienkov
2021-11-30 19:49:28 +01:00
parent 5857a0d819
commit 7b12c38524
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -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) {