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

Commit c8cc6d03 authored by Alex Stetson's avatar Alex Stetson Committed by Automerger Merge Worker
Browse files

Merge "Restrict PHONE_CALL ops based on TelecomService" into tm-dev am: 68c29dc3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17200774



Change-Id: Ic78e17c7252c1b72aca3a4f8dad7d55b144b49cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e3250aa2 68c29dc3

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

+6 −2
Original line number Diff line number Diff line
@@ -187,8 +187,12 @@ 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)) {

        // Restrict phone call ops if the TelecomService will not start (conditioned on having

        // FEATURE_MICROPHONE, FEATURE_TELECOM, or FEATURE_TELEPHONY).

        PackageManager pm = mContext.getPackageManager();

        if (!pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)

                && !pm.hasSystemFeature(PackageManager.FEATURE_MICROPHONE)

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

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

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

                    null, UserHandle.USER_ALL);