diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-03-04 00:05:12 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-03-04 00:05:12 +0000 |
| commit | c732036168273faf219d2fbf675243d1370f24f9 (patch) | |
| tree | 7cdad51dadb926443cc359f0403e929a0b3c6b74 | |
| parent | 397036e73c2b46acf53d723daf5f783baab36466 (diff) | |
| parent | fbae346f30673db84c66849828c4b7fe6868417d (diff) | |
| download | android_packages_apps_Camera2-c732036168273faf219d2fbf675243d1370f24f9.tar.gz android_packages_apps_Camera2-c732036168273faf219d2fbf675243d1370f24f9.tar.bz2 android_packages_apps_Camera2-c732036168273faf219d2fbf675243d1370f24f9.zip | |
Snap for 5349241 from fbae346f30673db84c66849828c4b7fe6868417d to qt-release
Change-Id: Ibb904057ef7c64b72119308f41c973b1dd4683ee
| -rw-r--r-- | src/com/android/camera/SoundPlayer.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/com/android/camera/SoundPlayer.java b/src/com/android/camera/SoundPlayer.java index ff3f37f7a..6e76eb535 100644 --- a/src/com/android/camera/SoundPlayer.java +++ b/src/com/android/camera/SoundPlayer.java @@ -17,6 +17,7 @@ package com.android.camera; import android.content.Context; +import android.media.AudioAttributes; import android.media.AudioManager; import android.media.SoundPool; import android.util.SparseIntArray; @@ -39,8 +40,14 @@ public class SoundPlayer { */ public SoundPlayer(Context appContext) { mAppContext = appContext; - final int audioType = getAudioTypeForSoundPool(); - mSoundPool = new SoundPool(1 /* max streams */, audioType, 0 /* quality */); + mSoundPool = new SoundPool.Builder() + .setMaxStreams(1) + .setAudioAttributes(new AudioAttributes.Builder() + .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION) + .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) + .setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED) + .build()) + .build(); } /** @@ -86,10 +93,4 @@ public class SoundPlayer { public boolean isReleased() { return mIsReleased; } - - private static int getAudioTypeForSoundPool() { - // STREAM_SYSTEM_ENFORCED is hidden API. - return ApiHelper.getIntFieldIfExists(AudioManager.class, - "STREAM_SYSTEM_ENFORCED", null, AudioManager.STREAM_RING); - } } |