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

Commit 86ed242b authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by android-build-merger
Browse files

Merge "DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media... 

Merge "DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps"" into qt-dev
am: 88774ef6

Change-Id: I946451446323edc3dfbfc2e028cca887440d0a3c
parents 07509412 88774ef6

Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -480,10 +480,7 @@ java_defaults { 
        "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",

media/java/android/media/IMediaRoute2Callback.aidl

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
/*

 * Copyright 2019 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;



/**

 * @hide

 */

oneway interface IMediaRoute2Callback {

    void onRouteSelected(int uid, String routeId);

}

media/java/android/media/IMediaRoute2Provider.aidl

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
/*

 * Copyright 2019 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;



import android.media.IMediaRoute2Callback;



/**

 * {@hide}

 */

oneway interface IMediaRoute2Provider {

    void setCallback(IMediaRoute2Callback callback);

    void selectRoute(int uid, String id);

}

media/java/android/media/IMediaRouter2ManagerClient.aidl

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/*

 * Copyright 2019 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;



/**

 * {@hide}

 */

oneway interface IMediaRouter2ManagerClient {

    void onRouteSelected(int uid, String routeId);

    void onControlCategoriesChanged(int uid, in List<String> categories);

}

media/java/android/media/IMediaRouterService.aidl

+0 −8
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.media;



import android.media.IMediaRouterClient;

import android.media.IMediaRouter2ManagerClient;

import android.media.MediaRouterClientState;



/**
@@ -30,15 +29,8 @@ interface IMediaRouterService { 
    MediaRouterClientState getState(IMediaRouterClient client);

    boolean isPlaybackActive(IMediaRouterClient client);



    void setControlCategories(IMediaRouterClient client, in List<String> categories);

    void setDiscoveryRequest(IMediaRouterClient client, int routeTypes, boolean activeScan);

    void setSelectedRoute(IMediaRouterClient client, String routeId, boolean explicit);

    void requestSetVolume(IMediaRouterClient client, String routeId, int volume);

    void requestUpdateVolume(IMediaRouterClient client, String routeId, int direction);



    void registerManagerAsUser(IMediaRouter2ManagerClient callback,

            String packageName, int userId);

    void unregisterManager(IMediaRouter2ManagerClient callback);

    void setRemoteRoute(IMediaRouter2ManagerClient callback,

            int uid, String routeId, boolean explicit);

}