Merge "Fix capitalization on AudioPort callback method names" into lmp-dev (b5b3a1d3) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -3146,18 +3146,18 @@ public class AudioManager {
		* Callback method called upon audio port list update.
		* @param portList the updated list of audio ports
		*/
		public void OnAudioPortListUpdate(AudioPort[] portList);
		public void onAudioPortListUpdate(AudioPort[] portList);

		/**
		* Callback method called upon audio patch list update.
		* @param patchList the updated list of audio patches
		*/
		public void OnAudioPatchListUpdate(AudioPatch[] patchList);
		public void onAudioPatchListUpdate(AudioPatch[] patchList);

		/**
		* Callback method called when the mediaserver dies
		*/
		public void OnServiceDied();
		public void onServiceDied();
		}

		/**

+3 −3

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ class AudioPortEventHandler {
		case AUDIOPORT_EVENT_PORT_LIST_UPDATED:
		AudioPort[] portList = ports.toArray(new AudioPort[0]);
		for (int i = 0; i < listeners.size(); i++) {
		listeners.get(i).OnAudioPortListUpdate(portList);
		listeners.get(i).onAudioPortListUpdate(portList);
		}
		if (msg.what == AUDIOPORT_EVENT_PORT_LIST_UPDATED) {
		break;
		@@ -101,13 +101,13 @@ class AudioPortEventHandler {
		case AUDIOPORT_EVENT_PATCH_LIST_UPDATED:
		AudioPatch[] patchList = patches.toArray(new AudioPatch[0]);
		for (int i = 0; i < listeners.size(); i++) {
		listeners.get(i).OnAudioPatchListUpdate(patchList);
		listeners.get(i).onAudioPatchListUpdate(patchList);
		}
		break;

		case AUDIOPORT_EVENT_SERVICE_DIED:
		for (int i = 0; i < listeners.size(); i++) {
		listeners.get(i).OnServiceDied();
		listeners.get(i).onServiceDied();
		}
		break;