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

Commit 105ce244 authored by Evan Severson's avatar Evan Severson
Browse files

Show sensor use dialog for OP_PHONE_CALL_* 

We ignore appop notes/starts for the system UID. Telecom is the only
package on the device that uses OP_PHONE_CALL_* appops so we can
explicitly expect those for the note op.

Bug: 308489872
Test: Receive incoming phonecall. Outgoing calls can't be tested on our
      1P devices because our 1P dialer app doesn't allow outgoing calls
      when microphone is muted (technically there is no API for them to
      know this state)
Flag: com.android.server.telecom.flags.resolve_hidden_dependencies_two
Change-Id: I5266874d5a8de2122479d523821a9a4c15b981ea
parent 16c68f2d

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

+12 −4
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ public final class SensorPrivacyService extends SystemService { 
            }



            int sensor;

            boolean isPhoneCall = false;

            if (result == MODE_IGNORED) {

                if (code == OP_RECORD_AUDIO || code == OP_PHONE_CALL_MICROPHONE

                        || code == OP_RECEIVE_EXPLICIT_USER_INTERACTION_AUDIO) {
@@ -426,13 +427,16 @@ public final class SensorPrivacyService extends SystemService { 
                } else {

                    return;

                }

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

                    isPhoneCall = true;

                }

            } else {

                return;

            }



            final long token = Binder.clearCallingIdentity();

            try {

                onSensorUseStarted(uid, packageName, sensor);

                onSensorUseStarted(uid, packageName, sensor, isPhoneCall);

            } finally {

                Binder.restoreCallingIdentity(token);

            }
@@ -446,7 +450,8 @@ public final class SensorPrivacyService extends SystemService { 
         * @param sensor The sensor that is attempting to be used

         */

        @RequiresPermission(Manifest.permission.OBSERVE_SENSOR_PRIVACY)

        private void onSensorUseStarted(int uid, String packageName, int sensor) {

        private void onSensorUseStarted(int uid, String packageName, int sensor,

                boolean isPhoneCall) {

            UserHandle user = UserHandle.of(mCurrentUser);



            if (com.android.internal.camera.flags.Flags.cameraPrivacyAllowlist()
@@ -458,9 +463,12 @@ public final class SensorPrivacyService extends SystemService { 
                return;

            }



            if (uid == Process.SYSTEM_UID) {

            if (uid == Process.SYSTEM_UID

                    && !(com.android.server.telecom.flags.Flags.resolveHiddenDependenciesTwo()

                    && isPhoneCall)) {

                // If the system uid is being blamed for sensor access, the ui must be shown

                // explicitly using SensorPrivacyManager#showSensorUseDialog

                // explicitly using SensorPrivacyManager#showSensorUseDialog. An exception is made

                // for phone calls which are handled by the Telecom subsystem.

                return;

            }