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

Merge "Fix checkUsesFeature() in CdmService"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-30 21:04:02 +00:00
committed by Android (Google) Code Review
parent 45d6a85c8e 7b12c38524
commit 77243f982a
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;
@@ -1265,7 +1266,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) {