summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-07-29 17:14:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-28 22:45:16 +0000
commitb5b3a1d30b67af6dcf18eb0f71e1734e009ee90e (patch)
treeb0508a55d695672aefe9daff0aaa2e21eecfeef2
parentf83fdd0864f32a3e8d4a7d3a127759cf30b503a9 (diff)
parentfdaed9dcb63171379fd7c5a6208014bac505dbc6 (diff)
downloadframeworks_base-b5b3a1d30b67af6dcf18eb0f71e1734e009ee90e.zip
frameworks_base-b5b3a1d30b67af6dcf18eb0f71e1734e009ee90e.tar.gz
frameworks_base-b5b3a1d30b67af6dcf18eb0f71e1734e009ee90e.tar.bz2
Merge "Fix capitalization on AudioPort callback method names" into lmp-dev
-rw-r--r--media/java/android/media/AudioManager.java6
-rw-r--r--media/java/android/media/AudioPortEventHandler.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 1116127..ac63ea6 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -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();
}
/**
diff --git a/media/java/android/media/AudioPortEventHandler.java b/media/java/android/media/AudioPortEventHandler.java
index d5fea07..8d2c172 100644
--- a/media/java/android/media/AudioPortEventHandler.java
+++ b/media/java/android/media/AudioPortEventHandler.java
@@ -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;