Display and control your Android device
Throw AudioCaptureException on workaround error
Romain Vimontcf09e7832377
diff --git a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java b/server/src/main/java/com/genymobile/scrcpy/Workarounds.javaindex 8b8b4233..6a4a57e1 100644--- a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java+++ b/server/src/main/java/com/genymobile/scrcpy/Workarounds.java@@ -1,5 +1,6 @@package com.genymobile.scrcpy;+import com.genymobile.scrcpy.audio.AudioCaptureException;import com.genymobile.scrcpy.util.Ln;import android.annotation.SuppressLint;@@ -195,7 +196,8 @@ public final class Workarounds {@TargetApi(Build.VERSION_CODES.R)@SuppressLint("WrongConstant,MissingPermission")- public static AudioRecord createAudioRecord(int source, int sampleRate, int channelConfig, int channels, int channelMask, int encoding) {+ public static AudioRecord createAudioRecord(int source, int sampleRate, int channelConfig, int channels, int channelMask, int encoding) throws+ AudioCaptureException {// Vivo (and maybe some other third-party ROMs) modified `AudioRecord`'s constructor, requiring `Context`s from real App environment.//// This method invokes the `AudioRecord(long nativeRecordInJavaObj)` constructor to create an empty `AudioRecord` instance, then uses@@ -336,8 +338,8 @@ public final class Workarounds {return audioRecord;} catch (Exception e) {- Ln.e("Failed to invoke AudioRecord.<init>.", e);- throw new RuntimeException("Cannot create AudioRecord");+ Ln.e("Cannot create AudioRecord", e);+ throw new AudioCaptureException();}}}diff --git a/server/src/main/java/com/genymobile/scrcpy/audio/AudioCapture.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCapture.javaindex 1da2221e..609ea4c2 100644--- a/server/src/main/java/com/genymobile/scrcpy/audio/AudioCapture.java+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCapture.java@@ -109,7 +109,7 @@ public final class AudioCapture {}}- private void startRecording() {+ private void startRecording() throws AudioCaptureException {try {recorder = createAudioRecord(audioSource);} catch (NullPointerException e) {