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

Commit c6fc7c6c authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Rename addServiceAnnouncement-related methods" am: 6f68b4bf am: c31fa35b 

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

Change-Id: Ib3d1a0773170168cb3f2a1aa3c906d5a47286fe3
parents a9a8a815 c31fa35b

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -47549,14 +47549,14 @@ package android.telephony { 














  public class MbmsDownloadSession implements java.lang.AutoCloseable {















    method public void addProgressListener(@NonNull android.telephony.mbms.DownloadRequest, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.mbms.DownloadProgressListener);













    method public void addServiceAnnouncementFile(@NonNull byte[]);













    method public void addServiceAnnouncement(@NonNull byte[]);















    method public void addStatusListener(@NonNull android.telephony.mbms.DownloadRequest, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.mbms.DownloadStatusListener);















    method public void cancelDownload(@NonNull android.telephony.mbms.DownloadRequest);















    method public void close();















    method public static android.telephony.MbmsDownloadSession create(@NonNull android.content.Context, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.mbms.MbmsDownloadSessionCallback);















    method @Nullable public static android.telephony.MbmsDownloadSession create(@NonNull android.content.Context, @NonNull java.util.concurrent.Executor, int, @NonNull android.telephony.mbms.MbmsDownloadSessionCallback);















    method public void download(@NonNull android.telephony.mbms.DownloadRequest);













    method public static int getMaximumServiceAnnouncementFileSize();













    method public static int getMaximumServiceAnnouncementSize();















    method @Nullable public java.io.File getTempFileRootDirectory();















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















    method public void removeProgressListener(@NonNull android.telephony.mbms.DownloadRequest, @NonNull android.telephony.mbms.DownloadProgressListener);










@@ -49168,7 +49168,7 @@ package android.telephony.mbms {



























  public static class MbmsErrors.DownloadErrors {















    field public static final int ERROR_CANNOT_CHANGE_TEMP_FILE_ROOT = 401; // 0x191













    field public static final int ERROR_MALFORMED_SERVICE_ANNOUNCEMENT_FILE = 404; // 0x194













    field public static final int ERROR_MALFORMED_SERVICE_ANNOUNCEMENT = 404; // 0x194















    field public static final int ERROR_UNKNOWN_DOWNLOAD_REQUEST = 402; // 0x192















    field public static final int ERROR_UNKNOWN_FILE_INFO = 403; // 0x193















  }

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -12435,7 +12435,7 @@ package android.telephony.mbms.vendor {













  public class MbmsDownloadServiceBase extends android.os.Binder implements android.os.IInterface {















    ctor public MbmsDownloadServiceBase();















    method public int addProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener) throws android.os.RemoteException;













    method public int addServiceAnnouncementFile(int, @NonNull byte[]);













    method public int addServiceAnnouncement(int, @NonNull byte[]);















    method public int addStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener) throws android.os.RemoteException;















    method public android.os.IBinder asBinder();















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

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -4907,7 +4907,7 @@ package android.telephony.mbms.vendor {













  public class MbmsDownloadServiceBase extends android.os.Binder implements android.os.IInterface {















    ctor public MbmsDownloadServiceBase();















    method public int addProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener) throws android.os.RemoteException;













    method public int addServiceAnnouncementFile(int, @NonNull byte[]);













    method public int addServiceAnnouncement(int, @NonNull byte[]);















    method public int addStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener) throws android.os.RemoteException;















    method public android.os.IBinder asBinder();















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

































non-updatable-api/current.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -45717,14 +45717,14 @@ package android.telephony {



























  public class MbmsDownloadSession implements java.lang.AutoCloseable {















    method public void addProgressListener(@NonNull android.telephony.mbms.DownloadRequest, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.mbms.DownloadProgressListener);













    method public void addServiceAnnouncementFile(@NonNull byte[]);













    method public void addServiceAnnouncement(@NonNull byte[]);















    method public void addStatusListener(@NonNull android.telephony.mbms.DownloadRequest, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.mbms.DownloadStatusListener);















    method public void cancelDownload(@NonNull android.telephony.mbms.DownloadRequest);















    method public void close();















    method public static android.telephony.MbmsDownloadSession create(@NonNull android.content.Context, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.mbms.MbmsDownloadSessionCallback);















    method @Nullable public static android.telephony.MbmsDownloadSession create(@NonNull android.content.Context, @NonNull java.util.concurrent.Executor, int, @NonNull android.telephony.mbms.MbmsDownloadSessionCallback);















    method public void download(@NonNull android.telephony.mbms.DownloadRequest);













    method public static int getMaximumServiceAnnouncementFileSize();













    method public static int getMaximumServiceAnnouncementSize();















    method @Nullable public java.io.File getTempFileRootDirectory();















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















    method public void removeProgressListener(@NonNull android.telephony.mbms.DownloadRequest, @NonNull android.telephony.mbms.DownloadProgressListener);










@@ -47336,7 +47336,7 @@ package android.telephony.mbms {



























  public static class MbmsErrors.DownloadErrors {















    field public static final int ERROR_CANNOT_CHANGE_TEMP_FILE_ROOT = 401; // 0x191













    field public static final int ERROR_MALFORMED_SERVICE_ANNOUNCEMENT_FILE = 404; // 0x194













    field public static final int ERROR_MALFORMED_SERVICE_ANNOUNCEMENT = 404; // 0x194















    field public static final int ERROR_UNKNOWN_DOWNLOAD_REQUEST = 402; // 0x192















    field public static final int ERROR_UNKNOWN_FILE_INFO = 403; // 0x193















  }

























non-updatable-api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -11317,7 +11317,7 @@ package android.telephony.mbms.vendor {













  public class MbmsDownloadServiceBase extends android.os.Binder implements android.os.IInterface {















    ctor public MbmsDownloadServiceBase();















    method public int addProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener) throws android.os.RemoteException;













    method public int addServiceAnnouncementFile(int, @NonNull byte[]);













    method public int addServiceAnnouncement(int, @NonNull byte[]);















    method public int addStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener) throws android.os.RemoteException;















    method public android.os.IBinder asBinder();















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