Merge "Merge "Simplify synchronized code and add comments" am: 9791b54b88 am:... (9d976f06) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioSystem.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -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,12 +560,10 @@ public class AudioSystem
		@UnsupportedAppUsage
		private static void errorCallbackFromNative(int error)
		{
		ErrorCallback errorCallback = null;
		ErrorCallback errorCallback;
		synchronized (AudioSystem.class) {
		if (sErrorCallback != null) {
		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,12 +597,10 @@ 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;
		}
		}
		if (cb != null) {
		switch(event) {
		case DYNAMIC_POLICY_EVENT_MIX_STATE_UPDATE:
		@@ -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;
		}