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

Merge "Simplify synchronized code and add comments" am: 9791b54b88 am: b57f32e68a am: 9760c42784

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

Change-Id: Ic8a04251bb1d6b35b0516525fc8ac6eea06c537e
This commit is contained in:
Treehugger Robot
2020-09-01 20:03:09 +00:00
committed by Automerger Merge Worker
parent 45b1415cc8 9760c42784
commit ddf2351c06
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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