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

Commit ebe0a4cc authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Add @TestApi for EMBMS APIs needed for CTS" am: f1167ced 

am: cca2b5a2

Change-Id: I495d10d673d0ac194835446b5c4587bf26246d7e
parents 4a45e043 cca2b5a2

api/test-current.txt

+17 −0
Original line number Diff line number Diff line
@@ -40964,6 +40964,7 @@ package android.telephony.mbms { 
  }















  public final class FileServiceInfo extends android.telephony.mbms.ServiceInfo implements android.os.Parcelable {













    ctor public FileServiceInfo(java.util.Map<java.util.Locale, java.lang.String>, java.lang.String, java.util.List<java.util.Locale>, java.lang.String, java.util.Date, java.util.Date, java.util.List<android.telephony.mbms.FileInfo>);















    method public int describeContents();















    method public java.util.List<android.telephony.mbms.FileInfo> getFiles();















    method public void writeToParcel(android.os.Parcel, int);










@@ -41072,6 +41073,22 @@ package android.telephony.mbms {



























package android.telephony.mbms.vendor {



























  public class MbmsDownloadServiceBase extends android.os.Binder {













    ctor public MbmsDownloadServiceBase();













    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 int getDownloadStatus(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo) throws android.os.RemoteException;













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













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













    method public void onAppCallbackDied(int, int);













    method public int registerStateCallback(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStateCallback) throws android.os.RemoteException;













    method public int requestUpdateFileServices(int, java.util.List<java.lang.String>) throws android.os.RemoteException;













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













    method public int setTempFileRootDirectory(int, java.lang.String) throws android.os.RemoteException;













    method public int unregisterStateCallback(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStateCallback) throws android.os.RemoteException;













  }



























  public class MbmsStreamingServiceBase extends android.os.Binder {















    ctor public MbmsStreamingServiceBase();















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

























telephony/java/android/telephony/mbms/FileServiceInfo.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.telephony.mbms;































import android.annotation.SystemApi;













import android.annotation.TestApi;















import android.os.Parcel;















import android.os.Parcelable;

























@@ -35,6 +36,7 @@ public final class FileServiceInfo extends ServiceInfo implements Parcelable {





























    /** @hide */















    @SystemApi













    @TestApi















    public FileServiceInfo(Map<Locale, String> newNames, String newClassName,















            List<Locale> newLocales, String newServiceId, Date start, Date end,















            List<FileInfo> newFiles) {

































telephony/java/android/telephony/mbms/vendor/MbmsDownloadServiceBase.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.telephony.mbms.vendor;





























import android.annotation.NonNull;















import android.annotation.SystemApi;













import android.annotation.TestApi;















import android.content.Intent;















import android.os.Binder;















import android.os.IBinder;









@@ -42,6 +43,7 @@ import java.util.Map;













 * @hide















 */















@SystemApi













@TestApi















public class MbmsDownloadServiceBase extends IMbmsDownloadService.Stub {















    private final Map<IBinder, DownloadStateCallback> mDownloadCallbackBinderMap = new HashMap<>();















    private final Map<IBinder, DeathRecipient> mDownloadCallbackDeathRecipients = new HashMap<>();