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

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

Browse Source 
* changes:
  [automerge] DO NOT MERGE Restrict PHONE_CALL ops based on TelecomService 2p: 1ce47bf129
  DO NOT MERGE Restrict PHONE_CALL ops based on TelecomService
This commit is contained in:
TreeHugger Robot
2022-03-14 23:41:45 +00:00
committed by Android (Google) Code Review
parent 95dc32f484 cacb58a2eb
commit 45852c2567
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/policy/AppOpsPolicy.java
View File

@@ -185,8 +185,13 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat
initializeActivityRecognizersTags(); initializeActivityRecognizersTags();
// If this device does not have telephony, restrict the phone call ops // If this device does not have telephony or microphone features, the TelecomService will
if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) { // 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); AppOpsManager appOps = mContext.getSystemService(AppOpsManager.class);
appOps.setUserRestrictionForUser(AppOpsManager.OP_PHONE_CALL_MICROPHONE, true, mToken, appOps.setUserRestrictionForUser(AppOpsManager.OP_PHONE_CALL_MICROPHONE, true, mToken,
null, UserHandle.USER_ALL); null, UserHandle.USER_ALL);