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

Commit 374db029 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Remove getDefaultTransactionName and getTransactionName from API" 

am: 8c74e1a7

Change-Id: I89efceac3ee5d19530b4f759303379de91c19b75
parents 026b89e4 8c74e1a7

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -7712,8 +7712,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);
@@ -7741,9 +7739,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
@@ -1591,8 +1591,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);
@@ -1620,9 +1618,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;