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

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

Merge "Apply suggested edits to the file-download API" am: f6c9baa0 am: 3934c475 

am: febecb82

Change-Id: Ibf5acac5b44c772b629472591124151c479c8f6c
parents 2089f926 febecb82

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ LOCAL_SRC_FILES += \ 
	telecomm/java/com/android/internal/telecom/IInCallService.aidl \

	telecomm/java/com/android/internal/telecom/ITelecomService.aidl \

	telecomm/java/com/android/internal/telecom/RemoteServiceCallback.aidl \

        telephony/java/android/telephony/mbms/IMbmsDownloadManagerCallback.aidl \

	telephony/java/android/telephony/mbms/IMbmsDownloadSessionCallback.aidl \

	telephony/java/android/telephony/mbms/IMbmsStreamingSessionCallback.aidl \

	telephony/java/android/telephony/mbms/IDownloadStateCallback.aidl \

        telephony/java/android/telephony/mbms/IStreamingServiceCallback.aidl \

api/current.txt

+22 −22
Original line number Diff line number Diff line
@@ -39910,20 +39910,20 @@ package android.telephony { 
    field public static final int STATUS_UNKNOWN_ERROR = 4; // 0x4

  }









  public class MbmsDownloadManager {









    method public void cancelDownload(android.telephony.mbms.DownloadRequest) throws android.telephony.mbms.MbmsException;









    method public static android.telephony.MbmsDownloadManager create(android.content.Context, android.telephony.mbms.MbmsDownloadManagerCallback) throws android.telephony.mbms.MbmsException;









    method public static android.telephony.MbmsDownloadManager create(android.content.Context, android.telephony.mbms.MbmsDownloadManagerCallback, android.os.Handler) throws android.telephony.mbms.MbmsException;









    method public static android.telephony.MbmsDownloadManager create(android.content.Context, android.telephony.mbms.MbmsDownloadManagerCallback, int) throws android.telephony.mbms.MbmsException;









    method public static android.telephony.MbmsDownloadManager create(android.content.Context, android.telephony.mbms.MbmsDownloadManagerCallback, int, android.os.Handler) throws android.telephony.mbms.MbmsException;









    method public void dispose();









    method public void download(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStateCallback, android.os.Handler) throws android.telephony.mbms.MbmsException;









    method public int getDownloadStatus(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo) throws android.telephony.mbms.MbmsException;









    method public void getFileServices(java.util.List<java.lang.String>) throws android.telephony.mbms.MbmsException;









  public class MbmsDownloadSession implements java.lang.AutoCloseable {









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









    method public void close();









    method public static android.telephony.MbmsDownloadSession create(android.content.Context, android.telephony.mbms.MbmsDownloadSessionCallback, android.os.Handler);









    method public static android.telephony.MbmsDownloadSession create(android.content.Context, android.telephony.mbms.MbmsDownloadSessionCallback, int, android.os.Handler);









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









    method public int getDownloadStatus(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo);









    method public java.io.File getTempFileRootDirectory();









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









    method public void resetDownloadKnowledge(android.telephony.mbms.DownloadRequest) throws android.telephony.mbms.MbmsException;









    method public void setTempFileRootDirectory(java.io.File) throws android.telephony.mbms.MbmsException;









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









    method public void registerStateCallback(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStateCallback, android.os.Handler);









    method public void requestUpdateFileServices(java.util.List<java.lang.String>);









    method public void resetDownloadKnowledge(android.telephony.mbms.DownloadRequest);









    method public void setTempFileRootDirectory(java.io.File);









    method public void unregisterStateCallback(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStateCallback);









    field public static final java.lang.String DEFAULT_TOP_LEVEL_TEMP_DIRECTORY = "androidMbmsTempFileRoot";









    field public static final java.lang.String EXTRA_MBMS_COMPLETED_FILE_URI = "android.telephony.extra.MBMS_COMPLETED_FILE_URI";









    field public static final java.lang.String EXTRA_MBMS_DOWNLOAD_RESULT = "android.telephony.extra.MBMS_DOWNLOAD_RESULT";








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







  public class DownloadStateCallback {









    ctor public DownloadStateCallback();









    method public void onProgressUpdated(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo, int, int, int, int);









    method public void onStateChanged(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo, int);









    method public void onStateUpdated(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo, int);









  }

















  public final class FileInfo implements android.os.Parcelable {








@@ -40623,18 +40623,18 @@ package android.telephony.mbms {







    field public static final android.os.Parcelable.Creator<android.telephony.mbms.FileServiceInfo> CREATOR;









  }

















  public class MbmsDownloadManagerCallback {









    ctor public MbmsDownloadManagerCallback();









    method public void onError(int, java.lang.String);









    method public void onFileServicesUpdated(java.util.List<android.telephony.mbms.FileServiceInfo>);









    method public void onMiddlewareReady();









  }

















  public class MbmsDownloadReceiver extends android.content.BroadcastReceiver {









    ctor public MbmsDownloadReceiver();









    method public void onReceive(android.content.Context, android.content.Intent);









  }

















  public class MbmsDownloadSessionCallback {









    ctor public MbmsDownloadSessionCallback();









    method public void onError(int, java.lang.String);









    method public void onFileServicesUpdated(java.util.List<android.telephony.mbms.FileServiceInfo>);









    method public void onMiddlewareReady();









  }

















  public class MbmsException extends java.lang.Exception {









    method public int getErrorCode();









    field public static final int ERROR_MIDDLEWARE_LOST = 3; // 0x3








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















  public class ServiceInfo {









    method public java.util.List<java.util.Locale> getLocales();









    method public java.util.Map<java.util.Locale, java.lang.String> getNames();









    method public java.lang.CharSequence getNameForLocale(java.util.Locale);









    method public java.lang.String getServiceClassName();









    method public java.lang.String getServiceId();









    method public java.util.Date getSessionEndTime();

























api/system-current.txt



+27
−25






























Original line number
Diff line number
Diff line







@@ -43349,20 +43349,20 @@ package android.telephony {







    field public static final int STATUS_UNKNOWN_ERROR = 4; // 0x4









  }

















  public class MbmsDownloadManager {









    method public void cancelDownload(android.telephony.mbms.DownloadRequest) throws android.telephony.mbms.MbmsException;









    method public static android.telephony.MbmsDownloadManager create(android.content.Context, android.telephony.mbms.MbmsDownloadManagerCallback) throws android.telephony.mbms.MbmsException;









    method public static android.telephony.MbmsDownloadManager create(android.content.Context, android.telephony.mbms.MbmsDownloadManagerCallback, android.os.Handler) throws android.telephony.mbms.MbmsException;









    method public static android.telephony.MbmsDownloadManager create(android.content.Context, android.telephony.mbms.MbmsDownloadManagerCallback, int) throws android.telephony.mbms.MbmsException;









    method public static android.telephony.MbmsDownloadManager create(android.content.Context, android.telephony.mbms.MbmsDownloadManagerCallback, int, android.os.Handler) throws android.telephony.mbms.MbmsException;









    method public void dispose();









    method public void download(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStateCallback, android.os.Handler) throws android.telephony.mbms.MbmsException;









    method public int getDownloadStatus(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo) throws android.telephony.mbms.MbmsException;









    method public void getFileServices(java.util.List<java.lang.String>) throws android.telephony.mbms.MbmsException;









  public class MbmsDownloadSession implements java.lang.AutoCloseable {









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









    method public void close();









    method public static android.telephony.MbmsDownloadSession create(android.content.Context, android.telephony.mbms.MbmsDownloadSessionCallback, android.os.Handler);









    method public static android.telephony.MbmsDownloadSession create(android.content.Context, android.telephony.mbms.MbmsDownloadSessionCallback, int, android.os.Handler);









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









    method public int getDownloadStatus(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo);









    method public java.io.File getTempFileRootDirectory();









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









    method public void resetDownloadKnowledge(android.telephony.mbms.DownloadRequest) throws android.telephony.mbms.MbmsException;









    method public void setTempFileRootDirectory(java.io.File) throws android.telephony.mbms.MbmsException;









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









    method public void registerStateCallback(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStateCallback, android.os.Handler);









    method public void requestUpdateFileServices(java.util.List<java.lang.String>);









    method public void resetDownloadKnowledge(android.telephony.mbms.DownloadRequest);









    method public void setTempFileRootDirectory(java.io.File);









    method public void unregisterStateCallback(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStateCallback);









    field public static final java.lang.String DEFAULT_TOP_LEVEL_TEMP_DIRECTORY = "androidMbmsTempFileRoot";









    field public static final java.lang.String EXTRA_MBMS_COMPLETED_FILE_URI = "android.telephony.extra.MBMS_COMPLETED_FILE_URI";









    field public static final java.lang.String EXTRA_MBMS_DOWNLOAD_RESULT = "android.telephony.extra.MBMS_DOWNLOAD_RESULT";








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







  public class DownloadStateCallback {









    ctor public DownloadStateCallback();









    method public void onProgressUpdated(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo, int, int, int, int);









    method public void onStateChanged(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo, int);









    method public void onStateUpdated(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo, int);









  }

















  public final class FileInfo implements android.os.Parcelable {








@@ -44186,13 +44186,6 @@ package android.telephony.mbms {







    field public static final android.os.Parcelable.Creator<android.telephony.mbms.FileServiceInfo> CREATOR;









  }

















  public class MbmsDownloadManagerCallback {









    ctor public MbmsDownloadManagerCallback();









    method public void onError(int, java.lang.String);









    method public void onFileServicesUpdated(java.util.List<android.telephony.mbms.FileServiceInfo>);









    method public void onMiddlewareReady();









  }

















  public class MbmsDownloadReceiver extends android.content.BroadcastReceiver {









    ctor public MbmsDownloadReceiver();









    method public void onReceive(android.content.Context, android.content.Intent);








@@ -44204,6 +44197,13 @@ package android.telephony.mbms {







    field public static final int RESULT_TEMP_FILE_GENERATION_ERROR = 5; // 0x5









  }

















  public class MbmsDownloadSessionCallback {









    ctor public MbmsDownloadSessionCallback();









    method public void onError(int, java.lang.String);









    method public void onFileServicesUpdated(java.util.List<android.telephony.mbms.FileServiceInfo>);









    method public void onMiddlewareReady();









  }

















  public class MbmsException extends java.lang.Exception {









    method public int getErrorCode();









    field public static final int ERROR_MIDDLEWARE_LOST = 3; // 0x3








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















  public class ServiceInfo {









    method public java.util.List<java.util.Locale> getLocales();









    method public java.util.Map<java.util.Locale, java.lang.String> getNames();









    method public java.lang.CharSequence getNameForLocale(java.util.Locale);









    method public java.lang.String getServiceClassName();









    method public java.lang.String getServiceId();









    method public java.util.Date getSessionEndTime();








@@ -44306,14 +44306,16 @@ package android.telephony.mbms.vendor {







    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, android.telephony.mbms.DownloadStateCallback);









    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 getFileServices(int, java.util.List<java.lang.String>) throws android.os.RemoteException;









    method public int initialize(int, android.telephony.mbms.MbmsDownloadManagerCallback) 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 {

























api/test-current.txt



+22
−22






























Original line number
Diff line number
Diff line







@@ -40181,20 +40181,20 @@ package android.telephony {







    field public static final int STATUS_UNKNOWN_ERROR = 4; // 0x4









  }

















  public class MbmsDownloadManager {









    method public void cancelDownload(android.telephony.mbms.DownloadRequest) throws android.telephony.mbms.MbmsException;









    method public static android.telephony.MbmsDownloadManager create(android.content.Context, android.telephony.mbms.MbmsDownloadManagerCallback) throws android.telephony.mbms.MbmsException;









    method public static android.telephony.MbmsDownloadManager create(android.content.Context, android.telephony.mbms.MbmsDownloadManagerCallback, android.os.Handler) throws android.telephony.mbms.MbmsException;









    method public static android.telephony.MbmsDownloadManager create(android.content.Context, android.telephony.mbms.MbmsDownloadManagerCallback, int) throws android.telephony.mbms.MbmsException;









    method public static android.telephony.MbmsDownloadManager create(android.content.Context, android.telephony.mbms.MbmsDownloadManagerCallback, int, android.os.Handler) throws android.telephony.mbms.MbmsException;









    method public void dispose();









    method public void download(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStateCallback, android.os.Handler) throws android.telephony.mbms.MbmsException;









    method public int getDownloadStatus(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo) throws android.telephony.mbms.MbmsException;









    method public void getFileServices(java.util.List<java.lang.String>) throws android.telephony.mbms.MbmsException;









  public class MbmsDownloadSession implements java.lang.AutoCloseable {









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









    method public void close();









    method public static android.telephony.MbmsDownloadSession create(android.content.Context, android.telephony.mbms.MbmsDownloadSessionCallback, android.os.Handler);









    method public static android.telephony.MbmsDownloadSession create(android.content.Context, android.telephony.mbms.MbmsDownloadSessionCallback, int, android.os.Handler);









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









    method public int getDownloadStatus(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo);









    method public java.io.File getTempFileRootDirectory();









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









    method public void resetDownloadKnowledge(android.telephony.mbms.DownloadRequest) throws android.telephony.mbms.MbmsException;









    method public void setTempFileRootDirectory(java.io.File) throws android.telephony.mbms.MbmsException;









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









    method public void registerStateCallback(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStateCallback, android.os.Handler);









    method public void requestUpdateFileServices(java.util.List<java.lang.String>);









    method public void resetDownloadKnowledge(android.telephony.mbms.DownloadRequest);









    method public void setTempFileRootDirectory(java.io.File);









    method public void unregisterStateCallback(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStateCallback);









    field public static final java.lang.String DEFAULT_TOP_LEVEL_TEMP_DIRECTORY = "androidMbmsTempFileRoot";









    field public static final java.lang.String EXTRA_MBMS_COMPLETED_FILE_URI = "android.telephony.extra.MBMS_COMPLETED_FILE_URI";









    field public static final java.lang.String EXTRA_MBMS_DOWNLOAD_RESULT = "android.telephony.extra.MBMS_DOWNLOAD_RESULT";








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







  public class DownloadStateCallback {









    ctor public DownloadStateCallback();









    method public void onProgressUpdated(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo, int, int, int, int);









    method public void onStateChanged(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo, int);









    method public void onStateUpdated(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo, int);









  }

















  public final class FileInfo implements android.os.Parcelable {








@@ -40894,18 +40894,18 @@ package android.telephony.mbms {







    field public static final android.os.Parcelable.Creator<android.telephony.mbms.FileServiceInfo> CREATOR;









  }

















  public class MbmsDownloadManagerCallback {









    ctor public MbmsDownloadManagerCallback();









    method public void onError(int, java.lang.String);









    method public void onFileServicesUpdated(java.util.List<android.telephony.mbms.FileServiceInfo>);









    method public void onMiddlewareReady();









  }

















  public class MbmsDownloadReceiver extends android.content.BroadcastReceiver {









    ctor public MbmsDownloadReceiver();









    method public void onReceive(android.content.Context, android.content.Intent);









  }

















  public class MbmsDownloadSessionCallback {









    ctor public MbmsDownloadSessionCallback();









    method public void onError(int, java.lang.String);









    method public void onFileServicesUpdated(java.util.List<android.telephony.mbms.FileServiceInfo>);









    method public void onMiddlewareReady();









  }

















  public class MbmsException extends java.lang.Exception {









    method public int getErrorCode();









    field public static final int ERROR_MIDDLEWARE_LOST = 3; // 0x3








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















  public class ServiceInfo {









    method public java.util.List<java.util.Locale> getLocales();









    method public java.util.Map<java.util.Locale, java.lang.String> getNames();









    method public java.lang.CharSequence getNameForLocale(java.util.Locale);









    method public java.lang.String getServiceClassName();









    method public java.lang.String getServiceId();









    method public java.util.Date getSessionEndTime();