commit a1c7990bc465ef8066b231e95d4227ec2a6b6713
author Kyunglyul Hyun <klhyun@google.com> Tue Apr 09 17:00:51 2019 +0900
committer Kyunglyul Hyun <klhyun@google.com> Mon Apr 15 11:44:55 2019 +0900
tree 01518402d9e7a6f2ce1c291f232181029b82a8c6
parent e0603420f8bf8ad6e0a3e45c7f726de31b24c2f1

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

This reverts commit 1c8188f2b40cad3dcefdcc3b7e308451bd705180.

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 6a85f62..c3025e8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -480,10 +480,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",
@@ -1836,4 +1833,4 @@
     name: "framework-aidl-mappings",
     srcs: [":framework-defaults"],
     output: "framework-aidl-mappings.txt"
-}
+}
\ No newline at end of file