summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2019-04-17 13:46:19 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-04-17 13:46:19 +0000
commit8c74e1a7c015166585a744dcc784f762b9d27b0b (patch)
tree1f758a069c2cd25a39d717b8cf573896c2bf761a
parent3444dd03d62ccec24816c30de140454d3ece50c0 (diff)
parent27736b8acae0af3938fdeef1e5b5a97b7cbc8a5b (diff)
Merge "Remove getDefaultTransactionName and getTransactionName from API"
-rw-r--r--api/system-current.txt4
-rw-r--r--api/test-current.txt4
2 files changed, 0 insertions, 8 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 74fb8ac8f754..71dcdac2d0bc 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -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;
diff --git a/api/test-current.txt b/api/test-current.txt
index 6430d35c0cce..dc5ff8f229c2 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -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;