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

Commit 05820c8f authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "telephony: suppress warnings in AIDL" am: 89242df0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796511

Change-Id: Id02daf502a31ee333ea368621f072efc07104323
parents 001460d8 89242df0

telephony/java/android/telephony/mbms/IMbmsGroupCallSessionCallback.aidl

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ oneway interface IMbmsGroupCallSessionCallback 
{

    void onError(int errorCode, String message);



    @SuppressWarnings(value={"untyped-collection"})

    void onAvailableSaisUpdated(in List currentSai, in List availableSais);



    void onServiceInterfaceAvailable(String interfaceName, int index);

telephony/java/android/telephony/mbms/vendor/IMbmsGroupCallService.aidl

+2 −0
Original line number Diff line number Diff line
@@ -29,9 +29,11 @@ interface IMbmsGroupCallService 


    void stopGroupCall(int subId, long tmgi);



    @SuppressWarnings(value={"untyped-collection"})

    void updateGroupCall(int subscriptionId, long tmgi, in List saiList,

        in List frequencyList);



    @SuppressWarnings(value={"untyped-collection"})

    int startGroupCall(int subscriptionId, long tmgi, in List saiList,

        in List frequencyList, IGroupCallCallback callback);

telephony/java/com/android/internal/telephony/ITelephony.aidl

+1 −0
Original line number Diff line number Diff line
@@ -1980,6 +1980,7 @@ interface ITelephony { 
    /**

     * Return the emergency number list from all the active subscriptions.

     */

    @SuppressWarnings(value={"untyped-collection"})

    Map getEmergencyNumberList(String callingPackage, String callingFeatureId);



    /**