Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01a500ed authored by Jeff Brown's avatar Jeff Brown
Browse files

Delete first draft of media routing APIs. 

The new APIs will not be as tightly integrated into MediaSession.

Change-Id: I5cfd37d9d8d0c5d46c55edb5cf0772a8f1ef13ab
parent 9fb7b07c

Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -320,9 +320,6 @@ LOCAL_SRC_FILES += \ 
	media/java/android/media/IRemoteVolumeObserver.aidl \

	media/java/android/media/IRingtonePlayer.aidl \

	media/java/android/media/IVolumeController.aidl \

	media/java/android/media/routeprovider/IRouteConnection.aidl \

	media/java/android/media/routeprovider/IRouteProvider.aidl \

	media/java/android/media/routeprovider/IRouteProviderCallback.aidl \

	media/java/android/media/session/IActiveSessionsListener.aidl \

	media/java/android/media/session/ISessionController.aidl \

	media/java/android/media/session/ISessionControllerCallback.aidl \

cmds/media/src/com/android/commands/media/Media.java

+0 −6
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.media.session.ISessionManager; 
import android.media.session.MediaController;

import android.media.session.MediaSessionInfo;

import android.media.session.PlaybackState;

import android.media.session.RouteInfo;

import android.os.Bundle;

import android.os.HandlerThread;

import android.os.IBinder;
@@ -180,11 +179,6 @@ public class Media extends BaseCommand { 
            System.out.println("onSessionEvent event=" + event + ", extras=" + extras);

        }



        @Override

        public void onRouteChanged(RouteInfo route) {

            System.out.println("onRouteChanged " + route);

        }



        @Override

        public void onPlaybackStateChanged(PlaybackState state) {

            System.out.println("onPlaybackStateChanged " + state);

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2149,7 +2149,7 @@ 
        android:description="@string/permdesc_bindTvInput"

        android:protectionLevel="signature|system" />



    <!-- Must be required by a {@link android.media.routeprovider.RouteProviderService}

    <!-- Must be required by a {@link android.media.routing.MediaRouteService}

         to ensure that only the system can interact with it.

         @hide -->

    <permission android:name="android.permission.BIND_ROUTE_PROVIDER"

media/java/android/media/routeprovider/IRouteConnection.aidl

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/* Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.media.routeprovider;



import android.media.session.RouteCommand;

import android.os.ResultReceiver;



/**

 * Interface for a specific connected route.

 * @hide

 */

oneway interface IRouteConnection {

    void onCommand(in RouteCommand command, in ResultReceiver cb);

    void disconnect();

}
 
 No newline at end of file

media/java/android/media/routeprovider/IRouteProvider.aidl

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
/* Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.media.routeprovider;



import android.media.routeprovider.IRouteConnection;

import android.media.routeprovider.IRouteProviderCallback;

import android.media.routeprovider.RouteRequest;

import android.media.session.RouteInfo;

import android.os.Bundle;

import android.os.ResultReceiver;



/**

 * Interface to an app's RouteProviderService.

 * @hide

 */

oneway interface IRouteProvider {

    void registerCallback(in IRouteProviderCallback cb);

    void unregisterCallback(in IRouteProviderCallback cb);

    void updateDiscoveryRequests(in List<RouteRequest> requests);



    void getAvailableRoutes(in List<RouteRequest> requests, in ResultReceiver cb);

    void connect(in RouteInfo route, in RouteRequest request, in ResultReceiver cb);

}
 
 No newline at end of file