PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-30 09:39:33 +00:00
committed by Android (Google) Code Review
parent 3d16fc9519 1a2b34b625
commit fde0bee473
2 changed files with 76 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/notification/AudioHelper.java
View File

@@ -22,6 +22,7 @@ import android.media.AudioManager;
import android.media.AudioSystem;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.Log;
import com.android.settings.Utils;
@@ -30,6 +31,7 @@ import com.android.settings.Utils;
*/
public class AudioHelper {
private static final String TAG = "AudioHelper";
private Context mContext;
private AudioManager mAudioManager;
@@ -76,6 +78,15 @@ public class AudioHelper {
}
public int getMinVolume(int stream) {
return mAudioManager.getStreamMinVolume(stream);
int minVolume;
try {
minVolume = mAudioManager.getStreamMinVolume(stream);
} catch (IllegalArgumentException e) {
Log.w(TAG, "Invalid stream type " + stream);
// Fallback to STREAM_VOICE_CALL because CallVolumePreferenceController.java default
// return STREAM_VOICE_CALL in getAudioStream
minVolume = mAudioManager.getStreamMinVolume(AudioManager.STREAM_VOICE_CALL);
}
return minVolume;
}
}