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

Merge "Consistent null-checking in MediaRouter."

Browse Source
This commit is contained in:
P.Y. Laligand
2015-04-18 01:56:42 +00:00
committed by Android (Google) Code Review
parent 6b875a7497 9d93a378c5
commit 928bfc4e1c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ package android.media;
import android.Manifest;
import android.annotation.DrawableRes;
import android.annotation.NonNull;
import android.app.ActivityThread;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -882,8 +883,12 @@ public class MediaRouter {
* @param types type flags indicating which types this route should be used for.
* The route must support at least a subset.
* @param route Route to select
* @throws IllegalArgumentException if the given route is {@code null}
*/
public void selectRoute(int types, RouteInfo route) {
public void selectRoute(int types, @NonNull RouteInfo route) {
if (route == null) {
throw new IllegalArgumentException("Route cannot be null.");
}
selectRouteStatic(types, route, true);
}
@@ -894,7 +899,8 @@ public class MediaRouter {
selectRouteStatic(types, route, explicit);
}
static void selectRouteStatic(int types, RouteInfo route, boolean explicit) {
static void selectRouteStatic(int types, @NonNull RouteInfo route, boolean explicit) {
assert(route != null);
final RouteInfo oldRoute = sStatic.mSelectedRoute;
if (oldRoute == route) return;
if (!route.matchesTypes(types)) {
@@ -917,7 +923,7 @@ public class MediaRouter {
final WifiDisplay activeDisplay =
sStatic.mDisplayService.getWifiDisplayStatus().getActiveDisplay();
final boolean oldRouteHasAddress = oldRoute != null && oldRoute.mDeviceAddress != null;
final boolean newRouteHasAddress = route != null && route.mDeviceAddress != null;
final boolean newRouteHasAddress = route.mDeviceAddress != null;
if (activeDisplay != null || oldRouteHasAddress || newRouteHasAddress) {
if (newRouteHasAddress && !matchesDeviceAddress(activeDisplay, route)) {
if (sStatic.mCanConfigureWifiDisplays) {