commit dd3f305bb3111eb91583ced44f5f10d76e409878
author Kyunglyul Hyun <klhyun@google.com> Tue Apr 09 17:00:51 2019 +0900
committer Kyunglyul Hyun <klhyun@google.com> Wed Apr 10 11:56:00 2019 +0900
tree f89aa2ed448beed9fd19c49cd34e73017027b867
parent ded8fe9246a5aa31ae59d4e35d2e05c2ca9e8803

DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps"

This reverts commit 1c8188f2b40cad3dcefdcc3b7e308451bd705180.

Test: atest android.media.cts.MediaRouterTest
Change-Id: I1de6fbeb81b1d5ef0ec4b73173b6525d4c6edc07

Android.bp

diff --git a/Android.bp b/Android.bp
index 21054dd..df90606 100644
--- a/Android.bp
+++ b/Android.bp
@@ -479,10 +479,7 @@
         "media/java/android/media/IMediaHTTPConnection.aidl",
         "media/java/android/media/IMediaHTTPService.aidl",
         "media/java/android/media/IMediaResourceMonitor.aidl",
-        "media/java/android/media/IMediaRoute2Callback.aidl",
-        "media/java/android/media/IMediaRoute2Provider.aidl",
         "media/java/android/media/IMediaRouterClient.aidl",
-        "media/java/android/media/IMediaRouter2ManagerClient.aidl",
         "media/java/android/media/IMediaRouterService.aidl",
         "media/java/android/media/IMediaScannerListener.aidl",
         "media/java/android/media/IMediaScannerService.aidl",
@@ -1835,4 +1832,4 @@
     name: "framework-aidl-mappings",
     srcs: [":framework-defaults"],
     output: "framework-aidl-mappings.txt"
-}
+}
\ No newline at end of file