Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77243f98 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix checkUsesFeature() in CdmService"

parents 45d6a85c 7b12c385

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {