Merge "MediaRouter2: Add RouteDiscoveryPrefernce.EMPTY as @SystemApi" into sc-dev

core/api/system-current.txt

@@ -5239,7 +5239,6 @@ package android.media {
     method @Nullable public String getClientPackageName();
     method @Nullable public android.media.MediaRouter2.RoutingController getController(@NonNull String);
     method @Nullable public static android.media.MediaRouter2 getInstance(@NonNull android.content.Context, @NonNull String);
-    method public void registerRouteCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.MediaRouter2.RouteCallback);
     method public void setRouteVolume(@NonNull android.media.MediaRoute2Info, int);
     method public void startScan();
     method public void stopScan();
@@ -5263,6 +5262,10 @@ package android.media {
     method @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public static void ensureDefaultRingtones(@NonNull android.content.Context);
   }
 
+  public final class RouteDiscoveryPreference implements android.os.Parcelable {
+    field public static final android.media.RouteDiscoveryPreference EMPTY;
+  }
+
 }
 
 package android.media.audiofx {

media/java/android/media/MediaRouter2.java

@@ -298,24 +298,6 @@ public final class MediaRouter2 {
         return mClientPackageName;
     }
 
-    /**
-     * Registers a callback to receive route related events when they change.
-     * <p>
-     * If the specified callback is already registered, its registration will be updated for the
-     * given {@link Executor executor}.
-     * <p>
-     * This will be no-op for non-system routers.
-     * @hide
-     */
-    @SystemApi
-    public void registerRouteCallback(@NonNull @CallbackExecutor Executor executor,
-            @NonNull RouteCallback routeCallback) {
-        if (!isSystemRouter()) {
-            return;
-        }
-        registerRouteCallback(executor, routeCallback, RouteDiscoveryPreference.EMPTY);
-    }
-
     /**
      * Registers a callback to discover routes and to receive events when they change.
      * <p>

media/java/android/media/RouteDiscoveryPreference.java

@@ -18,6 +18,7 @@ package android.media;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.SystemApi;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -68,9 +69,10 @@ public final class RouteDiscoveryPreference implements Parcelable {
     private final Bundle mExtras;
 
     /**
-     * An empty discovery preference
+     * An empty discovery preference.
      * @hide
      */
+    @SystemApi
     public static final RouteDiscoveryPreference EMPTY =
             new Builder(Collections.emptyList(), false).build();