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

Minor changes on MediaBrowser

Browse Source 
am: 77dc4bb09e

* commit '77dc4bb09e4b8682add75d3d65ca176e93e474fb':
  Minor changes on MediaBrowser
This commit is contained in:
Sungsoo Lim
2016-02-16 06:43:55 +00:00
committed by android-build-merger
parent 4ee70aa9c7 77dc4bb09e
commit 01da43b1a4
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
media/java/android/media/browse/MediaBrowser.java
View File

@@ -470,7 +470,7 @@ public final class MediaBrowser {
sub = new Subscription();
mSubscriptions.put(parentId, sub);
}
sub.add(callback, options);
sub.putCallback(options, callback);
// If we are connected, tell the service that we are watching. If we aren't connected,
// the service will be told when we connect.
@@ -502,7 +502,7 @@ public final class MediaBrowser {
Subscription sub = mSubscriptions.get(parentId);
// Tell the service if necessary.
if (sub != null && sub.remove(options) && mState == CONNECT_STATE_CONNECTED) {
if (sub != null && sub.removeCallback(options) && mState == CONNECT_STATE_CONNECTED) {
try {
// NOTE: Do not call removeSubscriptionWithOptions when options are null. Otherwise,
// it will break the action of support library which expects removeSubscription will
@@ -1093,7 +1093,16 @@ public final class MediaBrowser {
return mCallbacks;
}
public void add(SubscriptionCallback callback, Bundle options) {
public SubscriptionCallback getCallback(Bundle options) {
for (int i = 0; i < mOptionsList.size(); ++i) {
if (MediaBrowserUtils.areSameOptions(mOptionsList.get(i), options)) {
return mCallbacks.get(i);
}
}
return null;
}
public void putCallback(Bundle options, SubscriptionCallback callback) {
for (int i = 0; i < mOptionsList.size(); ++i) {
if (MediaBrowserUtils.areSameOptions(mOptionsList.get(i), options)) {
mCallbacks.set(i, callback);
@@ -1104,7 +1113,7 @@ public final class MediaBrowser {
mOptionsList.add(options);
}
public boolean remove(Bundle options) {
public boolean removeCallback(Bundle options) {
for (int i = 0; i < mOptionsList.size(); ++i) {
if (MediaBrowserUtils.areSameOptions(mOptionsList.get(i), options)) {
mCallbacks.remove(i);
@@ -1114,14 +1123,5 @@ public final class MediaBrowser {
}
return false;
}
public SubscriptionCallback getCallback(Bundle options) {
for (int i = 0; i < mOptionsList.size(); ++i) {
if (MediaBrowserUtils.areSameOptions(mOptionsList.get(i), options)) {
return mCallbacks.get(i);
}
}
return null;
}
}
}

2
media/java/android/service/media/MediaBrowserService.java
View File

@@ -121,7 +121,7 @@ public abstract class MediaBrowserService extends Service {
* be thrown.
*
* @see MediaBrowserService#onLoadChildren
* @see MediaBrowserService#onGetMediaItem
* @see MediaBrowserService#onLoadItem
*/
public class Result<T> {
private Object mDebug;