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

Commit 2c36876b authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Android (Google) Code Review
Browse files

Merge "Media: enables MR2PS to update provider info"

parents 2e37f683 3aedf025

Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -480,10 +480,10 @@ 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/IMediaRoute2ProviderClient.aidl",

        "media/java/android/media/IMediaRouterClient.aidl",

        "media/java/android/media/IMediaRouter2ManagerClient.aidl",

        "media/java/android/media/IMediaRouter2Manager.aidl",

        "media/java/android/media/IMediaRouterService.aidl",

        "media/java/android/media/IMediaScannerListener.aidl",

        "media/java/android/media/IMediaScannerService.aidl",

media/java/android/media/IMediaRoute2Provider.aidl

+2 −2
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


package android.media;



import android.media.IMediaRoute2Callback;

import android.media.IMediaRoute2ProviderClient;



/**

 * {@hide}

 */

oneway interface IMediaRoute2Provider {

    void setCallback(IMediaRoute2Callback callback);

    void registerClient(IMediaRoute2ProviderClient client);

    void selectRoute(int uid, String id);

}

media/java/android/media/IMediaRouter2ManagerClient.aidl→media/java/android/media/IMediaRoute2ProviderClient.aidl

+6 −4
Original line number Diff line number Diff line
@@ -16,10 +16,12 @@ 


package android.media;



import android.media.MediaRoute2ProviderInfo;



/**

 * {@hide}

 * @hide

 */

oneway interface IMediaRouter2ManagerClient {

    void onRouteSelected(int uid, String routeId);

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

oneway interface IMediaRoute2ProviderClient {

    void notifyRouteSelected(int uid, String routeId);

    void notifyProviderInfoUpdated(in MediaRoute2ProviderInfo info);

}

media/java/android/media/IMediaRouter2Manager.aidl

0 → 100644
+28 −0
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.MediaRoute2ProviderInfo;



/**

 * {@hide}

 */

oneway interface IMediaRouter2Manager {

    void notifyRouteSelected(int uid, String routeId);

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

    void notifyProviderInfoUpdated(in MediaRoute2ProviderInfo info);

}

media/java/android/media/IMediaRouterService.aidl

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



import android.media.IMediaRouterClient;

import android.media.IMediaRouter2ManagerClient;

import android.media.IMediaRouter2Manager;

import android.media.MediaRouterClientState;



/**
@@ -36,9 +36,9 @@ interface IMediaRouterService { 
    void requestSetVolume(IMediaRouterClient client, String routeId, int volume);

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



    void registerManagerAsUser(IMediaRouter2ManagerClient callback,

    void registerManagerAsUser(IMediaRouter2Manager manager,

            String packageName, int userId);

    void unregisterManager(IMediaRouter2ManagerClient callback);

    void setRemoteRoute(IMediaRouter2ManagerClient callback,

    void unregisterManager(IMediaRouter2Manager manager);

    void setRemoteRoute(IMediaRouter2Manager manager,

            int uid, String routeId, boolean explicit);

}