drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev

Browse Source
This commit is contained in:
Jeff Brown
2013-05-31 00:54:41 +00:00
committed by Android (Google) Code Review
parent e302c70643 14507e257a
commit 636af7a1cb
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@ -12216,7 +12216,7 @@ package android.media {
method public void removeCallback(android.media.MediaRouter.Callback);
method public void removeUserRoute(android.media.MediaRouter.UserRouteInfo);
method public void selectRoute(int, android.media.MediaRouter.RouteInfo);
field public static final int CALLBACK_FLAG_ACTIVE_SCAN = 1; // 0x1
field public static final int CALLBACK_FLAG_PERFORM_ACTIVE_SCAN = 1; // 0x1
field public static final int CALLBACK_FLAG_UNFILTERED_EVENTS = 2; // 0x2
field public static final int ROUTE_TYPE_LIVE_AUDIO = 1; // 0x1
field public static final int ROUTE_TYPE_LIVE_VIDEO = 2; // 0x2

2
core/java/com/android/internal/app/MediaRouteChooserDialogFragment.java
View File

@ -97,7 +97,7 @@ public class MediaRouteChooserDialogFragment extends DialogFragment {
public void onAttach(Activity activity) {
super.onAttach(activity);
mRouter = (MediaRouter) activity.getSystemService(Context.MEDIA_ROUTER_SERVICE);
mRouter.addCallback(mRouteTypes, mCallback, MediaRouter.CALLBACK_FLAG_ACTIVE_SCAN);
mRouter.addCallback(mRouteTypes, mCallback, MediaRouter.CALLBACK_FLAG_PERFORM_ACTIVE_SCAN);
}
@Override

10
media/java/android/media/MediaRouter.java
View File

@ -230,7 +230,7 @@ public class MediaRouter {
final int count = mCallbacks.size();
for (int i = 0; i < count; i++) {
CallbackInfo cbi = mCallbacks.get(i);
if ((cbi.flags & CALLBACK_FLAG_ACTIVE_SCAN) != 0
if ((cbi.flags & CALLBACK_FLAG_PERFORM_ACTIVE_SCAN) != 0
&& (cbi.type & type) != 0) {
return true;
}
@ -329,7 +329,7 @@ public class MediaRouter {
* discover and select a new route.
* </p>
*/
public static final int CALLBACK_FLAG_ACTIVE_SCAN = 1 << 0;
public static final int CALLBACK_FLAG_PERFORM_ACTIVE_SCAN = 1 << 0;
/**
* Flag for {@link #addCallback}: Do not filter route events.
@ -438,7 +438,7 @@ public class MediaRouter {
* @param types Types of routes this callback is interested in
* @param cb Callback to add
* @param flags Flags to control the behavior of the callback.
* May be zero or a combination of {@link #CALLBACK_FLAG_ACTIVE_SCAN} and
* May be zero or a combination of {@link #CALLBACK_FLAG_PERFORM_ACTIVE_SCAN} and
* {@link #CALLBACK_FLAG_UNFILTERED_EVENTS}.
*/
public void addCallback(int types, Callback cb, int flags) {
@ -452,7 +452,7 @@ public class MediaRouter {
info = new CallbackInfo(cb, types, flags, this);
sStatic.mCallbacks.add(info);
}
if ((info.flags & CALLBACK_FLAG_ACTIVE_SCAN) != 0) {
if ((info.flags & CALLBACK_FLAG_PERFORM_ACTIVE_SCAN) != 0) {
sStatic.updateActiveScan();
}
}
@ -466,7 +466,7 @@ public class MediaRouter {
int index = findCallbackInfo(cb);
if (index >= 0) {
CallbackInfo info = sStatic.mCallbacks.remove(index);
if ((info.flags & CALLBACK_FLAG_ACTIVE_SCAN) != 0) {
if ((info.flags & CALLBACK_FLAG_PERFORM_ACTIVE_SCAN) != 0) {
sStatic.updateActiveScan();
}
} else {