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

Merge "Merge "Simplify synchronized code and add comments" am: 9791b54b88 am: b57f32e68a am: 9760c42784 am: ddf2351c06" into rvc-qpr-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-09-01 20:18:02 +00:00
committed by Android (Google) Code Review
parent 70191c3a11 b92131f012
commit 9d976f0663
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media/java/android/media/AudioSystem.java
View File

@@ -523,6 +523,7 @@ public class AudioSystem
/** @hide Media server died. see ErrorCallback */
public static final int AUDIO_STATUS_SERVER_DIED = 100;
// all accesses must be synchronized (AudioSystem.class)
private static ErrorCallback sErrorCallback;
/** @hide
@@ -559,11 +560,9 @@ public class AudioSystem
@UnsupportedAppUsage
private static void errorCallbackFromNative(int error)
{
ErrorCallback errorCallback = null;
ErrorCallback errorCallback;
synchronized (AudioSystem.class) {
if (sErrorCallback != null) {
errorCallback = sErrorCallback;
}
errorCallback = sErrorCallback;
}
if (errorCallback != null) {
errorCallback.onError(error);
@@ -583,6 +582,7 @@ public class AudioSystem
//keep in sync with include/media/AudioPolicy.h
private final static int DYNAMIC_POLICY_EVENT_MIX_STATE_UPDATE = 0;
// all accesses must be synchronized (AudioSystem.class)
private static DynamicPolicyCallback sDynPolicyCallback;
/** @hide */
@@ -597,11 +597,9 @@ public class AudioSystem
@UnsupportedAppUsage
private static void dynamicPolicyCallbackFromNative(int event, String regId, int val)
{
DynamicPolicyCallback cb = null;
DynamicPolicyCallback cb;
synchronized (AudioSystem.class) {
if (sDynPolicyCallback != null) {
cb = sDynPolicyCallback;
}
cb = sDynPolicyCallback;
}
if (cb != null) {
switch(event) {
@@ -645,6 +643,7 @@ public class AudioSystem
int activeSource, String packName);
}
// all accesses must be synchronized (AudioSystem.class)
private static AudioRecordingCallback sRecordingCallback;
/** @hide */
@@ -677,7 +676,7 @@ public class AudioSystem
int source, int portId, boolean silenced, int[] recordingFormat,
AudioEffect.Descriptor[] clientEffects, AudioEffect.Descriptor[] effects,
int activeSource) {
AudioRecordingCallback cb = null;
AudioRecordingCallback cb;
synchronized (AudioSystem.class) {
cb = sRecordingCallback;
}