MediaBrowser2: Fix naming inconsistencies
This CL modifies following APIs:
1. getLibraryRoot() related
- onGetRoot => onGetLibraryRoot
- onGetRootResult => onGetLibraryRootDone
2. getItem() related
- onLoadItem => onGetItem
- Also renamed argument: itemId => mediaId
- onItemLoaded => onGetItemDone
3. getChildren() related
- notifyChildrenChanged/onChildrenChanged
- Renamed argument: childCount => itemCount
- onLoadChildren => onGetChildren
- onChildrenLoaded => onGetChildrenDone
4. getSearchResult() related
- onLoadSearchResult => onGetSearchResult
- onSearchResultLoaded => onGetSearchResultDone
Bug: 73711101
Test: Passed MediaBrowser2Test
Change-Id: I7f59686e21f4de9d4512cd19067c944e49faad39
diff --git a/packages/MediaComponents/src/com/android/media/IMediaSession2Callback.aidl b/packages/MediaComponents/src/com/android/media/IMediaSession2Callback.aidl
index 9a0be7a..6a03989 100644
--- a/packages/MediaComponents/src/com/android/media/IMediaSession2Callback.aidl
+++ b/packages/MediaComponents/src/com/android/media/IMediaSession2Callback.aidl
@@ -47,12 +47,12 @@
//////////////////////////////////////////////////////////////////////////////////////////////
// Browser sepcific
//////////////////////////////////////////////////////////////////////////////////////////////
- void onGetRootResult(in Bundle rootHints, String rootMediaId, in Bundle rootExtra);
- void onItemLoaded(String mediaId, in Bundle result);
- void onChildrenChanged(String rootMediaId, int childCount, in Bundle extras);
- void onChildrenLoaded(String parentId, int page, int pageSize, in List<Bundle> result,
+ void onGetLibraryRootDone(in Bundle rootHints, String rootMediaId, in Bundle rootExtra);
+ void onGetItemDone(String mediaId, in Bundle result);
+ void onChildrenChanged(String rootMediaId, int itemCount, in Bundle extras);
+ void onGetChildrenDone(String parentId, int page, int pageSize, in List<Bundle> result,
in Bundle extras);
void onSearchResultChanged(String query, int itemCount, in Bundle extras);
- void onSearchResultLoaded(String query, int page, int pageSize, in List<Bundle> result,
+ void onGetSearchResultDone(String query, int page, int pageSize, in List<Bundle> result,
in Bundle extras);
}
diff --git a/packages/MediaComponents/src/com/android/media/MediaBrowser2Impl.java b/packages/MediaComponents/src/com/android/media/MediaBrowser2Impl.java
index c095187..9190dfc 100644
--- a/packages/MediaComponents/src/com/android/media/MediaBrowser2Impl.java
+++ b/packages/MediaComponents/src/com/android/media/MediaBrowser2Impl.java
@@ -180,23 +180,23 @@
}
}
- public void onGetRootResult(
+ public void onGetLibraryRootDone(
final Bundle rootHints, final String rootMediaId, final Bundle rootExtra) {
getCallbackExecutor().execute(() -> {
- mCallback.onGetRootResult(rootHints, rootMediaId, rootExtra);
+ mCallback.onGetLibraryRootDone(rootHints, rootMediaId, rootExtra);
});
}
- public void onItemLoaded(String mediaId, MediaItem2 item) {
+ public void onGetItemDone(String mediaId, MediaItem2 item) {
getCallbackExecutor().execute(() -> {
- mCallback.onItemLoaded(mediaId, item);
+ mCallback.onGetItemDone(mediaId, item);
});
}
- public void onChildrenLoaded(String parentId, int page, int pageSize, List<MediaItem2> result,
+ public void onGetChildrenDone(String parentId, int page, int pageSize, List<MediaItem2> result,
Bundle extras) {
getCallbackExecutor().execute(() -> {
- mCallback.onChildrenLoaded(parentId, page, pageSize, result, extras);
+ mCallback.onGetChildrenDone(parentId, page, pageSize, result, extras);
});
}
@@ -206,16 +206,16 @@
});
}
- public void onSearchResultLoaded(String query, int page, int pageSize, List<MediaItem2> result,
+ public void onGetSearchResultDone(String query, int page, int pageSize, List<MediaItem2> result,
Bundle extras) {
getCallbackExecutor().execute(() -> {
- mCallback.onSearchResultLoaded(query, page, pageSize, result, extras);
+ mCallback.onGetSearchResultDone(query, page, pageSize, result, extras);
});
}
- public void onChildrenChanged(final String parentId, int childCount, final Bundle extras) {
+ public void onChildrenChanged(final String parentId, int itemCount, final Bundle extras) {
getCallbackExecutor().execute(() -> {
- mCallback.onChildrenChanged(parentId, childCount, extras);
+ mCallback.onChildrenChanged(parentId, itemCount, extras);
});
}
}
diff --git a/packages/MediaComponents/src/com/android/media/MediaLibraryService2Impl.java b/packages/MediaComponents/src/com/android/media/MediaLibraryService2Impl.java
index b9d2fa4..1cce38a 100644
--- a/packages/MediaComponents/src/com/android/media/MediaLibraryService2Impl.java
+++ b/packages/MediaComponents/src/com/android/media/MediaLibraryService2Impl.java
@@ -95,23 +95,23 @@
@Override
public void notifyChildrenChanged_impl(ControllerInfo controller, String parentId,
- int childCount, Bundle extras) {
+ int itemCount, Bundle extras) {
if (controller == null) {
throw new IllegalArgumentException("controller shouldn't be null");
}
if (parentId == null) {
throw new IllegalArgumentException("parentId shouldn't be null");
}
- getSessionStub().notifyChildrenChangedNotLocked(controller, parentId, childCount,
+ getSessionStub().notifyChildrenChangedNotLocked(controller, parentId, itemCount,
extras);
}
@Override
- public void notifyChildrenChanged_impl(String parentId, int childCount, Bundle extras) {
+ public void notifyChildrenChanged_impl(String parentId, int itemCount, Bundle extras) {
if (parentId == null) {
throw new IllegalArgumentException("parentId shouldn't be null");
}
- getSessionStub().notifyChildrenChangedNotLocked(parentId, childCount, extras);
+ getSessionStub().notifyChildrenChangedNotLocked(parentId, itemCount, extras);
}
@Override
diff --git a/packages/MediaComponents/src/com/android/media/MediaSession2CallbackStub.java b/packages/MediaComponents/src/com/android/media/MediaSession2CallbackStub.java
index e174d91..2178ccd 100644
--- a/packages/MediaComponents/src/com/android/media/MediaSession2CallbackStub.java
+++ b/packages/MediaComponents/src/com/android/media/MediaSession2CallbackStub.java
@@ -209,7 +209,7 @@
// MediaBrowser specific
////////////////////////////////////////////////////////////////////////////////////////////
@Override
- public void onGetRootResult(Bundle rootHints, String rootMediaId, Bundle rootExtra)
+ public void onGetLibraryRootDone(Bundle rootHints, String rootMediaId, Bundle rootExtra)
throws RuntimeException {
final MediaBrowser2Impl browser;
try {
@@ -222,12 +222,12 @@
// TODO(jaewan): Revisit here. Could be a bug
return;
}
- browser.onGetRootResult(rootHints, rootMediaId, rootExtra);
+ browser.onGetLibraryRootDone(rootHints, rootMediaId, rootExtra);
}
@Override
- public void onItemLoaded(String mediaId, Bundle itemBundle) throws RuntimeException {
+ public void onGetItemDone(String mediaId, Bundle itemBundle) throws RuntimeException {
final MediaBrowser2Impl browser;
try {
browser = getBrowser();
@@ -239,12 +239,12 @@
// TODO(jaewan): Revisit here. Could be a bug
return;
}
- browser.onItemLoaded(mediaId,
+ browser.onGetItemDone(mediaId,
MediaItem2Impl.fromBundle(browser.getContext(), itemBundle));
}
@Override
- public void onChildrenLoaded(String parentId, int page, int pageSize,
+ public void onGetChildrenDone(String parentId, int page, int pageSize,
List<Bundle> itemBundleList, Bundle extras) throws RuntimeException {
final MediaBrowser2Impl browser;
try {
@@ -265,7 +265,7 @@
result.add(MediaItem2.fromBundle(browser.getContext(), bundle));
}
}
- browser.onChildrenLoaded(parentId, page, pageSize, result, extras);
+ browser.onGetChildrenDone(parentId, page, pageSize, result, extras);
}
@Override
@@ -286,7 +286,7 @@
}
@Override
- public void onSearchResultLoaded(String query, int page, int pageSize,
+ public void onGetSearchResultDone(String query, int page, int pageSize,
List<Bundle> itemBundleList, Bundle extras) throws RuntimeException {
final MediaBrowser2Impl browser;
try {
@@ -307,11 +307,11 @@
result.add(MediaItem2.fromBundle(browser.getContext(), bundle));
}
}
- browser.onSearchResultLoaded(query, page, pageSize, result, extras);
+ browser.onGetSearchResultDone(query, page, pageSize, result, extras);
}
@Override
- public void onChildrenChanged(String parentId, int childCount, Bundle extras) {
+ public void onChildrenChanged(String parentId, int itemCount, Bundle extras) {
final MediaBrowser2Impl browser;
try {
browser = getBrowser();
@@ -323,6 +323,6 @@
// TODO(jaewan): Revisit here. Could be a bug
return;
}
- browser.onChildrenChanged(parentId, childCount, extras);
+ browser.onChildrenChanged(parentId, itemCount, extras);
}
}
diff --git a/packages/MediaComponents/src/com/android/media/MediaSession2Stub.java b/packages/MediaComponents/src/com/android/media/MediaSession2Stub.java
index 914f85e..55ea490 100644
--- a/packages/MediaComponents/src/com/android/media/MediaSession2Stub.java
+++ b/packages/MediaComponents/src/com/android/media/MediaSession2Stub.java
@@ -554,9 +554,9 @@
return;
}
final ControllerInfoImpl controllerImpl = ControllerInfoImpl.from(controller);
- LibraryRoot root = session.getCallback().onGetRoot(controller, rootHints);
+ LibraryRoot root = session.getCallback().onGetLibraryRoot(controller, rootHints);
try {
- controllerImpl.getControllerBinder().onGetRootResult(rootHints,
+ controllerImpl.getControllerBinder().onGetLibraryRootDone(rootHints,
root == null ? null : root.getRootId(),
root == null ? null : root.getExtras());
} catch (RemoteException e) {
@@ -588,9 +588,9 @@
return;
}
final ControllerInfoImpl controllerImpl = ControllerInfoImpl.from(controller);
- MediaItem2 result = session.getCallback().onLoadItem(controller, mediaId);
+ MediaItem2 result = session.getCallback().onGetItem(controller, mediaId);
try {
- controllerImpl.getControllerBinder().onItemLoaded(
+ controllerImpl.getControllerBinder().onGetItemDone(
mediaId, result == null ? null : result.toBundle());
} catch (RemoteException e) {
// Controller may be died prematurely.
@@ -629,10 +629,10 @@
return;
}
final ControllerInfoImpl controllerImpl = ControllerInfoImpl.from(controller);
- List<MediaItem2> result = session.getCallback().onLoadChildren(
+ List<MediaItem2> result = session.getCallback().onGetChildren(
controller, parentId, page, pageSize, extras);
if (result != null && result.size() > pageSize) {
- throw new IllegalArgumentException("onLoadChildren() shouldn't return media items "
+ throw new IllegalArgumentException("onGetChildren() shouldn't return media items "
+ "more than pageSize. result.size()=" + result.size() + " pageSize="
+ pageSize);
}
@@ -646,7 +646,7 @@
}
try {
- controllerImpl.getControllerBinder().onChildrenLoaded(
+ controllerImpl.getControllerBinder().onGetChildrenDone(
parentId, page, pageSize, bundleList, extras);
} catch (RemoteException e) {
// Controller may be died prematurely.
@@ -712,10 +712,10 @@
return;
}
final ControllerInfoImpl controllerImpl = ControllerInfoImpl.from(controller);
- List<MediaItem2> result = session.getCallback().onLoadSearchResult(
+ List<MediaItem2> result = session.getCallback().onGetSearchResult(
controller, query, page, pageSize, extras);
if (result != null && result.size() > pageSize) {
- throw new IllegalArgumentException("onLoadSearchResult() shouldn't return media "
+ throw new IllegalArgumentException("onGetSearchResult() shouldn't return media "
+ "items more than pageSize. result.size()=" + result.size() + " pageSize="
+ pageSize);
}
@@ -729,7 +729,7 @@
}
try {
- controllerImpl.getControllerBinder().onSearchResultLoaded(
+ controllerImpl.getControllerBinder().onGetSearchResultDone(
query, page, pageSize, bundleList, extras);
} catch (RemoteException e) {
// Controller may be died prematurely.
@@ -754,7 +754,7 @@
if (session == null) {
return;
}
- session.getCallback().onSubscribed(controller, parentId, option);
+ session.getCallback().onSubscribe(controller, parentId, option);
synchronized (mLock) {
Set<String> subscription = mSubscriptions.get(controller);
if (subscription == null) {
@@ -781,7 +781,7 @@
if (session == null) {
return;
}
- session.getCallback().onUnsubscribed(controller, parentId);
+ session.getCallback().onUnsubscribe(controller, parentId);
synchronized (mLock) {
mSubscriptions.remove(controller);
}
@@ -951,23 +951,23 @@
}
public void notifyChildrenChangedNotLocked(ControllerInfo controller, String parentId,
- int childCount, Bundle extras) {
+ int itemCount, Bundle extras) {
// TODO(jaewan): Handle when controller is disconnected and no longer valid.
// Note: Commands may be sent while onConnected() is running. Should we also
// consider it as error?
- notifyChildrenChangedInternalNotLocked(controller, parentId, childCount, extras);
+ notifyChildrenChangedInternalNotLocked(controller, parentId, itemCount, extras);
}
- public void notifyChildrenChangedNotLocked(String parentId, int childCount, Bundle extras) {
+ public void notifyChildrenChangedNotLocked(String parentId, int itemCount, Bundle extras) {
final List<ControllerInfo> controllers = getControllers();
for (int i = 0; i < controllers.size(); i++) {
- notifyChildrenChangedInternalNotLocked(controllers.get(i), parentId, childCount,
+ notifyChildrenChangedInternalNotLocked(controllers.get(i), parentId, itemCount,
extras);
}
}
public void notifyChildrenChangedInternalNotLocked(final ControllerInfo controller,
- String parentId, int childCount, Bundle extras) {
+ String parentId, int itemCount, Bundle extras) {
// Ensure subscription
synchronized (mLock) {
Set<String> subscriptions = mSubscriptions.get(controller);
@@ -978,7 +978,7 @@
final IMediaSession2Callback callbackBinder =
ControllerInfoImpl.from(controller).getControllerBinder();
try {
- callbackBinder.onChildrenChanged(parentId, childCount, extras);
+ callbackBinder.onChildrenChanged(parentId, itemCount, extras);
} catch (RemoteException e) {
// TODO(jaewan): Handle controller removed?
}
diff --git a/packages/MediaComponents/test/src/android/media/MediaBrowser2Test.java b/packages/MediaComponents/test/src/android/media/MediaBrowser2Test.java
index 7e93232..1abb9b4 100644
--- a/packages/MediaComponents/test/src/android/media/MediaBrowser2Test.java
+++ b/packages/MediaComponents/test/src/android/media/MediaBrowser2Test.java
@@ -71,13 +71,13 @@
interface TestBrowserCallbackInterface extends TestControllerCallbackInterface {
// Browser specific callbacks
- default void onGetRootResult(Bundle rootHints, String rootMediaId, Bundle rootExtra) {}
- default void onItemLoaded(String mediaId, MediaItem2 result) {}
- default void onChildrenChanged(String parentId, int childCount, Bundle extras) {}
- default void onChildrenLoaded(String parentId, int page, int pageSize,
+ default void onGetLibraryRootDone(Bundle rootHints, String rootMediaId, Bundle rootExtra) {}
+ default void onGetItemDone(String mediaId, MediaItem2 result) {}
+ default void onChildrenChanged(String parentId, int itemCount, Bundle extras) {}
+ default void onGetChildrenDone(String parentId, int page, int pageSize,
List<MediaItem2> result, Bundle extras) {}
default void onSearchResultChanged(String query, int itemCount, Bundle extras) {}
- default void onSearchResultLoaded(String query, int page, int pageSize,
+ default void onGetSearchResultDone(String query, int page, int pageSize,
List<MediaItem2> result, Bundle extras) {}
}
@@ -89,7 +89,8 @@
final CountDownLatch latch = new CountDownLatch(1);
final TestControllerCallbackInterface callback = new TestBrowserCallbackInterface() {
@Override
- public void onGetRootResult(Bundle rootHints, String rootMediaId, Bundle rootExtra) {
+ public void onGetLibraryRootDone(Bundle rootHints, String rootMediaId,
+ Bundle rootExtra) {
assertTrue(TestUtils.equals(param, rootHints));
assertEquals(MockMediaLibraryService2.ROOT_ID, rootMediaId);
assertTrue(TestUtils.equals(MockMediaLibraryService2.EXTRAS, rootExtra));
@@ -111,7 +112,7 @@
final CountDownLatch latch = new CountDownLatch(1);
final TestControllerCallbackInterface callback = new TestBrowserCallbackInterface() {
@Override
- public void onItemLoaded(String mediaIdOut, MediaItem2 result) {
+ public void onGetItemDone(String mediaIdOut, MediaItem2 result) {
assertEquals(mediaId, mediaIdOut);
assertNotNull(result);
assertEquals(mediaId, result.getMediaId());
@@ -132,7 +133,7 @@
final CountDownLatch latch = new CountDownLatch(1);
final TestControllerCallbackInterface callback = new TestBrowserCallbackInterface() {
@Override
- public void onItemLoaded(String mediaIdOut, MediaItem2 result) {
+ public void onGetItemDone(String mediaIdOut, MediaItem2 result) {
assertEquals(mediaId, mediaIdOut);
assertNull(result);
latch.countDown();
@@ -156,7 +157,7 @@
final CountDownLatch latch = new CountDownLatch(1);
final TestControllerCallbackInterface callback = new TestBrowserCallbackInterface() {
@Override
- public void onChildrenLoaded(String parentIdOut, int pageOut, int pageSizeOut,
+ public void onGetChildrenDone(String parentIdOut, int pageOut, int pageSizeOut,
List<MediaItem2> result, Bundle extrasOut) {
assertEquals(parentId, parentIdOut);
assertEquals(page, pageOut);
@@ -192,7 +193,7 @@
final CountDownLatch latch = new CountDownLatch(1);
final TestControllerCallbackInterface callback = new TestBrowserCallbackInterface() {
@Override
- public void onChildrenLoaded(String parentIdOut, int pageOut, int pageSizeOut,
+ public void onGetChildrenDone(String parentIdOut, int pageOut, int pageSizeOut,
List<MediaItem2> result, Bundle extrasOut) {
assertNotNull(result);
assertEquals(0, result.size());
@@ -213,7 +214,7 @@
final CountDownLatch latch = new CountDownLatch(1);
final TestControllerCallbackInterface callback = new TestBrowserCallbackInterface() {
@Override
- public void onChildrenLoaded(String parentIdOut, int pageOut, int pageSizeOut,
+ public void onGetChildrenDone(String parentIdOut, int pageOut, int pageSizeOut,
List<MediaItem2> result, Bundle extrasOut) {
assertNull(result);
latch.countDown();
@@ -246,7 +247,7 @@
}
@Override
- public void onSearchResultLoaded(String queryOut, int pageOut, int pageSizeOut,
+ public void onGetSearchResultDone(String queryOut, int pageOut, int pageSizeOut,
List<MediaItem2> result, Bundle extrasOut) {
assertEquals(query, queryOut);
assertEquals(page, pageOut);
@@ -336,7 +337,7 @@
final CountDownLatch latch = new CountDownLatch(1);
final SessionCallbackProxy callbackProxy = new SessionCallbackProxy(mContext) {
@Override
- public void onSubscribed(ControllerInfo info, String parentId, Bundle extras) {
+ public void onSubscribe(ControllerInfo info, String parentId, Bundle extras) {
if (Process.myUid() == info.getUid()) {
assertEquals(testParentId, parentId);
assertTrue(TestUtils.equals(testExtras, extras));
@@ -357,7 +358,7 @@
final CountDownLatch latch = new CountDownLatch(1);
final SessionCallbackProxy callbackProxy = new SessionCallbackProxy(mContext) {
@Override
- public void onUnsubscribed(ControllerInfo info, String parentId) {
+ public void onUnsubscribe(ControllerInfo info, String parentId) {
if (Process.myUid() == info.getUid()) {
assertEquals(testParentId, parentId);
latch.countDown();
@@ -395,7 +396,7 @@
}
@Override
- public void onSubscribed(ControllerInfo info, String parentId, Bundle extras) {
+ public void onSubscribe(ControllerInfo info, String parentId, Bundle extras) {
if (Process.myUid() == info.getUid()) {
final MediaLibrarySession session = (MediaLibrarySession) mSession;
session.notifyChildrenChanged(testParentId2, testChildrenCount, null);
@@ -407,18 +408,17 @@
final TestBrowserCallbackInterface controllerCallbackProxy =
new TestBrowserCallbackInterface() {
@Override
- public void onChildrenChanged(String parentId, int childCount,
- Bundle extras) {
+ public void onChildrenChanged(String parentId, int itemCount, Bundle extras) {
switch ((int) latch.getCount()) {
case 3:
assertEquals(testParentId2, parentId);
- assertEquals(testChildrenCount, childCount);
+ assertEquals(testChildrenCount, itemCount);
assertNull(extras);
latch.countDown();
break;
case 2:
assertEquals(testParentId2, parentId);
- assertEquals(testChildrenCount, childCount);
+ assertEquals(testChildrenCount, itemCount);
assertTrue(TestUtils.equals(testExtras, extras));
latch.countDown();
break;
@@ -496,29 +496,29 @@
}
@Override
- public void onGetRootResult(Bundle rootHints, String rootMediaId, Bundle rootExtra) {
- super.onGetRootResult(rootHints, rootMediaId, rootExtra);
+ public void onGetLibraryRootDone(Bundle rootHints, String rootMediaId, Bundle rootExtra) {
+ super.onGetLibraryRootDone(rootHints, rootMediaId, rootExtra);
if (mCallbackProxy instanceof TestBrowserCallbackInterface) {
((TestBrowserCallbackInterface) mCallbackProxy)
- .onGetRootResult(rootHints, rootMediaId, rootExtra);
+ .onGetLibraryRootDone(rootHints, rootMediaId, rootExtra);
}
}
@Override
- public void onItemLoaded(String mediaId, MediaItem2 result) {
- super.onItemLoaded(mediaId, result);
+ public void onGetItemDone(String mediaId, MediaItem2 result) {
+ super.onGetItemDone(mediaId, result);
if (mCallbackProxy instanceof TestBrowserCallbackInterface) {
- ((TestBrowserCallbackInterface) mCallbackProxy).onItemLoaded(mediaId, result);
+ ((TestBrowserCallbackInterface) mCallbackProxy).onGetItemDone(mediaId, result);
}
}
@Override
- public void onChildrenLoaded(String parentId, int page, int pageSize,
+ public void onGetChildrenDone(String parentId, int page, int pageSize,
List<MediaItem2> result, Bundle extras) {
- super.onChildrenLoaded(parentId, page, pageSize, result, extras);
+ super.onGetChildrenDone(parentId, page, pageSize, result, extras);
if (mCallbackProxy instanceof TestBrowserCallbackInterface) {
((TestBrowserCallbackInterface) mCallbackProxy)
- .onChildrenLoaded(parentId, page, pageSize, result, extras);
+ .onGetChildrenDone(parentId, page, pageSize, result, extras);
}
}
@@ -532,21 +532,21 @@
}
@Override
- public void onSearchResultLoaded(String query, int page, int pageSize,
+ public void onGetSearchResultDone(String query, int page, int pageSize,
List<MediaItem2> result, Bundle extras) {
- super.onSearchResultLoaded(query, page, pageSize, result, extras);
+ super.onGetSearchResultDone(query, page, pageSize, result, extras);
if (mCallbackProxy instanceof TestBrowserCallbackInterface) {
((TestBrowserCallbackInterface) mCallbackProxy)
- .onSearchResultLoaded(query, page, pageSize, result, extras);
+ .onGetSearchResultDone(query, page, pageSize, result, extras);
}
}
@Override
- public void onChildrenChanged(String parentId, int childCount, Bundle extras) {
- super.onChildrenChanged(parentId, childCount, extras);
+ public void onChildrenChanged(String parentId, int itemCount, Bundle extras) {
+ super.onChildrenChanged(parentId, itemCount, extras);
if (mCallbackProxy instanceof TestBrowserCallbackInterface) {
((TestBrowserCallbackInterface) mCallbackProxy)
- .onChildrenChanged(parentId, childCount, extras);
+ .onChildrenChanged(parentId, itemCount, extras);
}
}
diff --git a/packages/MediaComponents/test/src/android/media/MockMediaLibraryService2.java b/packages/MediaComponents/test/src/android/media/MockMediaLibraryService2.java
index e1cce25..af14507 100644
--- a/packages/MediaComponents/test/src/android/media/MockMediaLibraryService2.java
+++ b/packages/MediaComponents/test/src/android/media/MockMediaLibraryService2.java
@@ -148,12 +148,12 @@
}
@Override
- public LibraryRoot onGetRoot(ControllerInfo controller, Bundle rootHints) {
+ public LibraryRoot onGetLibraryRoot(ControllerInfo controller, Bundle rootHints) {
return new LibraryRoot(MockMediaLibraryService2.this, ROOT_ID, EXTRAS);
}
@Override
- public MediaItem2 onLoadItem(ControllerInfo controller, String mediaId) {
+ public MediaItem2 onGetItem(ControllerInfo controller, String mediaId) {
if (MEDIA_ID_GET_ITEM.equals(mediaId)) {
return createMediaItem(mediaId);
} else {
@@ -162,7 +162,7 @@
}
@Override
- public List<MediaItem2> onLoadChildren(ControllerInfo controller, String parentId, int page,
+ public List<MediaItem2> onGetChildren(ControllerInfo controller, String parentId, int page,
int pageSize, Bundle extras) {
if (PARENT_ID.equals(parentId)) {
return getPaginatedResult(GET_CHILDREN_RESULT, page, pageSize);
@@ -195,7 +195,7 @@
}
@Override
- public List<MediaItem2> onLoadSearchResult(ControllerInfo controllerInfo,
+ public List<MediaItem2> onGetSearchResult(ControllerInfo controllerInfo,
String query, int page, int pageSize, Bundle extras) {
if (SEARCH_QUERY.equals(query)) {
return getPaginatedResult(SEARCH_RESULT, page, pageSize);
@@ -205,13 +205,13 @@
}
@Override
- public void onSubscribed(ControllerInfo controller, String parentId, Bundle extras) {
- mCallbackProxy.onSubscribed(controller, parentId, extras);
+ public void onSubscribe(ControllerInfo controller, String parentId, Bundle extras) {
+ mCallbackProxy.onSubscribe(controller, parentId, extras);
}
@Override
- public void onUnsubscribed(ControllerInfo controller, String parentId) {
- mCallbackProxy.onUnsubscribed(controller, parentId);
+ public void onUnsubscribe(ControllerInfo controller, String parentId) {
+ mCallbackProxy.onUnsubscribe(controller, parentId);
}
}
diff --git a/packages/MediaComponents/test/src/android/media/TestServiceRegistry.java b/packages/MediaComponents/test/src/android/media/TestServiceRegistry.java
index a18ad8e..08e0cf0 100644
--- a/packages/MediaComponents/test/src/android/media/TestServiceRegistry.java
+++ b/packages/MediaComponents/test/src/android/media/TestServiceRegistry.java
@@ -75,8 +75,8 @@
*/
public void onServiceDestroyed() { }
- public void onSubscribed(ControllerInfo info, String parentId, Bundle extra) { }
- public void onUnsubscribed(ControllerInfo info, String parentId) { }
+ public void onSubscribe(ControllerInfo info, String parentId, Bundle extra) { }
+ public void onUnsubscribe(ControllerInfo info, String parentId) { }
}
@GuardedBy("TestServiceRegistry.class")