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

Commit e996507f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove getDefaultTransactionName and getTransactionName from API" into qt-dev

parents 76d2f52e c5705a82

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -9418,8 +9418,6 @@ package android.telephony.mbms.vendor { 
    method public int cancelDownload(android.telephony.mbms.DownloadRequest) throws android.os.RemoteException;

    method public void dispose(int) throws android.os.RemoteException;

    method public int download(android.telephony.mbms.DownloadRequest) throws android.os.RemoteException;

    method public static String getDefaultTransactionName(int);

    method public String getTransactionName(int);

    method public int initialize(int, android.telephony.mbms.MbmsDownloadSessionCallback) throws android.os.RemoteException;

    method @NonNull public java.util.List<android.telephony.mbms.DownloadRequest> listPendingDownloads(int) throws android.os.RemoteException;

    method public void onAppCallbackDied(int, int);
@@ -9447,9 +9445,7 @@ package android.telephony.mbms.vendor { 
    ctor public MbmsStreamingServiceBase();

    method public android.os.IBinder asBinder();

    method public void dispose(int) throws android.os.RemoteException;

    method public static String getDefaultTransactionName(int);

    method @Nullable public android.net.Uri getPlaybackUri(int, String) throws android.os.RemoteException;

    method public String getTransactionName(int);

    method public int initialize(android.telephony.mbms.MbmsStreamingSessionCallback, int) throws android.os.RemoteException;

    method public void onAppCallbackDied(int, int);

    method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException;

api/test-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -2752,8 +2752,6 @@ package android.telephony.mbms.vendor { 
    method public int cancelDownload(android.telephony.mbms.DownloadRequest) throws android.os.RemoteException;

    method public void dispose(int) throws android.os.RemoteException;

    method public int download(android.telephony.mbms.DownloadRequest) throws android.os.RemoteException;

    method public static String getDefaultTransactionName(int);

    method public String getTransactionName(int);

    method public int initialize(int, android.telephony.mbms.MbmsDownloadSessionCallback) throws android.os.RemoteException;

    method @NonNull public java.util.List<android.telephony.mbms.DownloadRequest> listPendingDownloads(int) throws android.os.RemoteException;

    method public void onAppCallbackDied(int, int);
@@ -2781,9 +2779,7 @@ package android.telephony.mbms.vendor { 
    ctor public MbmsStreamingServiceBase();

    method public android.os.IBinder asBinder();

    method public void dispose(int) throws android.os.RemoteException;

    method public static String getDefaultTransactionName(int);

    method @Nullable public android.net.Uri getPlaybackUri(int, String) throws android.os.RemoteException;

    method public String getTransactionName(int);

    method public int initialize(android.telephony.mbms.MbmsStreamingSessionCallback, int) throws android.os.RemoteException;

    method public void onAppCallbackDied(int, int);

    method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException;