From f68d15cba3e0d19a2ce12bbbe2b4b38f667a871a Mon Sep 17 00:00:00 2001 From: henrika Date: Wed, 22 Nov 2017 16:54:33 +0100 Subject: [PATCH] Removes check of RECORD_AUDIO in native audio layer on Android. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This type of check should instead be performed by the application/client. If the app does not have mic permissions, construction of the AudioRecord object will fail and the user will receive an error callback anyhow. Bug: b/69434512 Change-Id: If1d7eff488f7c693697e048a567c17ed0c51f040 Reviewed-on: https://webrtc-review.googlesource.com/25261 Reviewed-by: Sami Kalliomäki Commit-Queue: Henrik Andreassson Cr-Commit-Position: refs/heads/master@{#20839} --- .../java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java | 5 ----- .../java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java | 6 ------ 2 files changed, 11 deletions(-) diff --git a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java index 71c7df18fc..f9bdc5d212 100644 --- a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java +++ b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java @@ -171,11 +171,6 @@ public class WebRtcAudioRecord { private int initRecording(int sampleRate, int channels) { Logging.d(TAG, "initRecording(sampleRate=" + sampleRate + ", channels=" + channels + ")"); - if (!WebRtcAudioUtils.hasPermission( - ContextUtils.getApplicationContext(), android.Manifest.permission.RECORD_AUDIO)) { - reportWebRtcAudioRecordInitError("RECORD_AUDIO permission is missing"); - return -1; - } if (audioRecord != null) { reportWebRtcAudioRecordInitError("InitRecording called twice without StopRecording."); return -1; diff --git a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java index e55d738c2c..3d66923a01 100644 --- a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java +++ b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java @@ -207,10 +207,4 @@ public final class WebRtcAudioUtils { + "Model: " + Build.MODEL + ", " + "Product: " + Build.PRODUCT); } - - // Checks if the process has as specified permission or not. - public static boolean hasPermission(Context context, String permission) { - return context.checkPermission(permission, Process.myPid(), Process.myUid()) - == PackageManager.PERMISSION_GRANTED; - } }