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

Commit 3d4e251a authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

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

am: 541aee66

Change-Id: I4cdf70d67b2b8fc37e72f550766d36bfe47a13d0
parents 2f7f27d8 541aee66

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -9419,8 +9419,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);
@@ -9448,9 +9446,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
@@ -2753,8 +2753,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);
@@ -2782,9 +2780,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;