Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding mustPlayShutterSound to break Cam2 dependency on Cam1" am: cb6c04738b am: 9b83844f48

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1911999

Change-Id: If3fc78d7c5e3a4813bb3ff5cd9e83b60af4857dc
This commit is contained in:
Treehugger Robot
2021-12-21 18:05:30 +00:00
committed by Automerger Merge Worker
parent 3dd00d784f 9b83844f48
commit 401703e3aa
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -21542,6 +21542,7 @@ package android.media {
public class MediaActionSound {
ctor public MediaActionSound();
method public void load(int);
method public static boolean mustPlayShutterSound();
method public void play(int);
method public void release();
field public static final int FOCUS_COMPLETE = 1; // 0x1

25
media/java/android/media/MediaActionSound.java
View File

@@ -16,8 +16,11 @@
package android.media;
import android.media.AudioManager;
import android.content.Context;
import android.media.SoundPool;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.util.Log;
/**
@@ -104,6 +107,26 @@ public class MediaActionSound {
private static final int STATE_LOADING_PLAY_REQUESTED = 2;
private static final int STATE_LOADED = 3;
/**
* <p>Returns true if the application must play the shutter sound in accordance
* to certain regional restrictions. </p>
*
* <p>If this method returns true, applications are strongly recommended to use
* MediaActionSound.play(SHUTTER_CLICK) or START_VIDEO_RECORDING whenever it captures
* images or video to storage or sends them over the network.</p>
*/
public static boolean mustPlayShutterSound() {
boolean result = false;
IBinder b = ServiceManager.getService(Context.AUDIO_SERVICE);
IAudioService audioService = IAudioService.Stub.asInterface(b);
try {
result = audioService.isCameraSoundForced();
} catch (RemoteException e) {
Log.e(TAG, "audio service is unavailable for queries, defaulting to false");
}
return result;
}
private class SoundState {
public final int name;
public int id;