Fix use of deprecated SoundPool API in Snap

Don't use stream types for operations other than volume control

[Chippa_a]: Extended for Snap

Bug: 122901916
Test: verify logcat doesn't show warnings, see bug
Change-Id: Id5b4f3b3c56c61a2f00172a470410e0670ce81b4
Signed-off-by: Chippa-a <vusal1372@gmail.com>

1 files changed, 9 insertions, 7 deletions

diff --git a/src/com/android/camera/SoundClips.java b/src/com/android/camera/SoundClips.java
index 8ccd51d4a..812734e2b 100644
--- a/src/com/android/camera/SoundClips.java
+++ b/src/com/android/camera/SoundClips.java
@@ -18,6 +18,7 @@ package com.android.camera;
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.MediaActionSound;
 import android.media.SoundPool;
@@ -50,12 +51,6 @@ public class SoundClips {
         }
     }
 
-    public static int getAudioTypeForSoundPool() {
-        // STREAM_SYSTEM_ENFORCED is hidden API.
-        return ApiHelper.getIntFieldIfExists(AudioManager.class,
-                "STREAM_SYSTEM_ENFORCED", null, AudioManager.STREAM_RING);
-    }
-
     /**
      * This class implements SoundClips.Player using MediaActionSound,
      * which exists since API level 16.
@@ -136,7 +131,14 @@ public class SoundClips {
 
             mSoundIDToPlay = ID_NOT_LOADED;
 
-            mSoundPool = new SoundPool(NUM_SOUND_STREAMS, getAudioTypeForSoundPool(), 0);
+            mSoundPool = new SoundPool.Builder()
+                    .setMaxStreams(NUM_SOUND_STREAMS)
+                    .setAudioAttributes(new AudioAttributes.Builder()
+                                    .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
+                                    .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                                    .setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED)
+                                    .build())
+                    .build();
             mSoundPool.setOnLoadCompleteListener(this);
 
             mSoundIDs = new int[SOUND_RES.length];