commit 57a3769fb12dc8b2df457e0919850bd976716706
author Ricardo Correa <rgcorrea@google.com> Mon Mar 23 17:27:25 2020 -0700
committer Ricardo Correa <rgcorrea@google.com> Tue Mar 24 16:20:36 2020 +0000
tree f170ceb064b6be5d9443af5f2f95ac55c612c270
parent 3006a83565b6863f247bf634faa929b84608026e

Revert "Allow call audio access for default dialer application"

This reverts commit ac26cf749f457e12a3d8d7456bbcd58a3e028d69.

Reason for revert: Feature has been postponed
Bug: 151761909

Change-Id: I90a977a23c5b97ddf95976cf2c4d517165f8e8c2

services/audiopolicy/service/AudioPolicyService.h

diff --git a/services/audiopolicy/service/AudioPolicyService.h b/services/audiopolicy/service/AudioPolicyService.h
index ff99124..9a619dd 100644
--- a/services/audiopolicy/service/AudioPolicyService.h
+++ b/services/audiopolicy/service/AudioPolicyService.h
@@ -83,7 +83,6 @@
                               audio_stream_type_t *stream,
                               pid_t pid,
                               uid_t uid,
-                              const String16& opPackageName,
                               const audio_config_t *config,
                               audio_output_flags_t flags,
                               audio_port_handle_t *selectedDeviceId,
@@ -812,16 +811,15 @@
                           const audio_io_handle_t io, uid_t uid, pid_t pid,
                           const audio_session_t session, audio_port_handle_t portId,
                           const audio_port_handle_t deviceId, const String16& opPackageName,
-                          bool canCaptureCallOrOutput, bool canCaptureHotword) :
+                          bool canCaptureOutput, bool canCaptureHotword) :
                     AudioClient(attributes, io, uid, pid, session, portId, deviceId),
                     opPackageName(opPackageName), startTimeNs(0),
-                    canCaptureCallOrOutput(canCaptureCallOrOutput),
-                    canCaptureHotword(canCaptureHotword) {}
+                    canCaptureOutput(canCaptureOutput), canCaptureHotword(canCaptureHotword) {}
                 ~AudioRecordClient() override = default;
 
         const String16 opPackageName;        // client package name
         nsecs_t startTimeNs;
-        const bool canCaptureCallOrOutput;
+        const bool canCaptureOutput;
         const bool canCaptureHotword;
     };