commit b7dc082b05c111057469358d9db94cc53cf7cae5
author Hyundo Moon <hdmoon@google.com> Tue Jan 07 16:49:31 2020 +0900
committer Hyundo Moon <hdmoon@google.com> Wed Jan 08 17:52:45 2020 +0900
tree d67480b81f31b4a65ce2e99b612ddbf89126a5f1
parent 5a6f835e28a4f8f4ea0c423ad853053c97fd4179

Make MediaRoute2Info#getId() unique in client side (MR2/Manager)

This CL makes MediaRoute2Info#getId() return a unique ID when it is
called for routes which were get via MediaRouter2 / MediaRouter2Manager.

Acordingly, this CL removes MediaRoute2Info#getUniqueId().

Bug: 147338138
Test: atest mediaroutertest
Change-Id: Id2960c45e9cabde7bc5b57554608aebe03fcbe04

services/core/java/com/android/server/media/MediaRoute2Provider.java

diff --git a/services/core/java/com/android/server/media/MediaRoute2Provider.java b/services/core/java/com/android/server/media/MediaRoute2Provider.java
index 115155c..55c4e21 100644
--- a/services/core/java/com/android/server/media/MediaRoute2Provider.java
+++ b/services/core/java/com/android/server/media/MediaRoute2Provider.java
@@ -20,7 +20,6 @@
 import android.annotation.Nullable;
 import android.content.ComponentName;
 import android.content.Intent;
-import android.media.MediaRoute2Info;
 import android.media.MediaRoute2ProviderInfo;
 import android.media.RouteSessionInfo;
 
@@ -50,13 +49,13 @@
             String controlCategory, long requestId);
     public abstract void releaseSession(int sessionId);
 
-    public abstract void selectRoute(int sessionId, MediaRoute2Info route);
-    public abstract void deselectRoute(int sessionId, MediaRoute2Info route);
-    public abstract void transferToRoute(int sessionId, MediaRoute2Info route);
+    public abstract void selectRoute(int sessionId, String routeId);
+    public abstract void deselectRoute(int sessionId, String routeId);
+    public abstract void transferToRoute(int sessionId, String routeId);
 
-    public abstract void sendControlRequest(MediaRoute2Info route, Intent request);
-    public abstract void requestSetVolume(MediaRoute2Info route, int volume);
-    public abstract void requestUpdateVolume(MediaRoute2Info route, int delta);
+    public abstract void sendControlRequest(String routeId, Intent request);
+    public abstract void requestSetVolume(String routeId, int volume);
+    public abstract void requestUpdateVolume(String routeId, int delta);
 
     @NonNull
     public String getUniqueId() {