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

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

Merge changes from topic "b-186518774" into sc-v2-dev-plus-aosp 

* changes:
  [automerge] DO NOT MERGE Restrict PHONE_CALL ops based on TelecomService 2p: 1ce47bf1
  DO NOT MERGE Restrict PHONE_CALL ops based on TelecomService
parents 95dc32f4 cacb58a2

services/core/java/com/android/server/policy/AppOpsPolicy.java

+7 −2
Original line number Diff line number Diff line
@@ -185,8 +185,13 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat 


        initializeActivityRecognizersTags();



        // If this device does not have telephony, restrict the phone call ops

        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {

        // If this device does not have telephony or microphone features, the TelecomService will

        // not be started (which sets phone call ops to allow only its package). Therefore, phone

        // call ops need to be restricted here.

        PackageManager pm = mContext.getPackageManager();

        if (!pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)

                && !pm.hasSystemFeature(PackageManager.FEATURE_MICROPHONE)

                && !pm.hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) {

            AppOpsManager appOps = mContext.getSystemService(AppOpsManager.class);

            appOps.setUserRestrictionForUser(AppOpsManager.OP_PHONE_CALL_MICROPHONE, true, mToken,

                    null, UserHandle.USER_ALL);