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

Commit 3b9fcd9c authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge "Restrict the mic and cam phone call ops when toggle is muted" into sc-dev am: b13bdd4a 

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

Change-Id: Ib35e9e85535b39c762b5e00d08b797647195ba81
parents 85553d02 b13bdd4a

services/core/java/com/android/server/SensorPrivacyService.java

+6 −11
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.app.ActivityManager.PROCESS_CAPABILITY_FOREGROUND_CAMERA; 
import static android.app.ActivityManager.PROCESS_CAPABILITY_FOREGROUND_MICROPHONE;

import static android.app.ActivityManager.RunningServiceInfo;

import static android.app.ActivityManager.RunningTaskInfo;

import static android.app.AppOpsManager.MODE_ALLOWED;

import static android.app.AppOpsManager.MODE_IGNORED;

import static android.app.AppOpsManager.OP_CAMERA;

import static android.app.AppOpsManager.OP_PHONE_CALL_CAMERA;
@@ -382,17 +381,9 @@ public final class SensorPrivacyService extends SystemService { 


            int sensor;

            if (result == MODE_IGNORED) {

                if (code == OP_RECORD_AUDIO) {

                if (code == OP_RECORD_AUDIO || code == OP_PHONE_CALL_MICROPHONE) {

                    sensor = MICROPHONE;

                } else if (code == OP_CAMERA) {

                    sensor = CAMERA;

                } else {

                    return;

                }

            } else if (result == MODE_ALLOWED) {

                if (code == OP_PHONE_CALL_MICROPHONE) {

                    sensor = MICROPHONE;

                } else if (code == OP_PHONE_CALL_CAMERA) {

                } else if (code == OP_CAMERA || code == OP_PHONE_CALL_CAMERA) {

                    sensor = CAMERA;

                } else {

                    return;
@@ -1276,10 +1267,14 @@ public final class SensorPrivacyService extends SystemService { 
                case MICROPHONE:

                    mAppOpsManagerInternal.setGlobalRestriction(OP_RECORD_AUDIO, enabled,

                            mAppOpsRestrictionToken);

                    mAppOpsManagerInternal.setGlobalRestriction(OP_PHONE_CALL_MICROPHONE, enabled,

                            mAppOpsRestrictionToken);

                    break;

                case CAMERA:

                    mAppOpsManagerInternal.setGlobalRestriction(OP_CAMERA, enabled,

                            mAppOpsRestrictionToken);

                    mAppOpsManagerInternal.setGlobalRestriction(OP_PHONE_CALL_CAMERA, enabled,

                            mAppOpsRestrictionToken);

                    break;

            }

        }