Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add @TestApi for EMBMS APIs needed for CTS"

Browse Source 
am: f1167ced38

Change-Id: If22e7de55c8ec2f603c4a59f575b65cebf421a93
This commit is contained in:
Hall Liu
2017-11-01 23:17:05 +00:00
committed by android-build-merger
parent e33d0f594e f1167ced38
commit cca2b5a246
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/test-current.txt
View File

@@ -40721,6 +40721,7 @@ package android.telephony.mbms {
} }
public final class FileServiceInfo extends android.telephony.mbms.ServiceInfo implements android.os.Parcelable { 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 int describeContents();
method public java.util.List<android.telephony.mbms.FileInfo> getFiles(); method public java.util.List<android.telephony.mbms.FileInfo> getFiles();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
@@ -40829,6 +40830,22 @@ package android.telephony.mbms {
package android.telephony.mbms.vendor { 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 { public class MbmsStreamingServiceBase extends android.os.Binder {
ctor public MbmsStreamingServiceBase(); ctor public MbmsStreamingServiceBase();
method public void dispose(int) throws android.os.RemoteException; method public void dispose(int) throws android.os.RemoteException;

2
telephony/java/android/telephony/mbms/FileServiceInfo.java
View File

@@ -17,6 +17,7 @@
package android.telephony.mbms; package android.telephony.mbms;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -35,6 +36,7 @@ public final class FileServiceInfo extends ServiceInfo implements Parcelable {
/** @hide */ /** @hide */
@SystemApi @SystemApi
@TestApi
public FileServiceInfo(Map<Locale, String> newNames, String newClassName, public FileServiceInfo(Map<Locale, String> newNames, String newClassName,
List<Locale> newLocales, String newServiceId, Date start, Date end, List<Locale> newLocales, String newServiceId, Date start, Date end,
List<FileInfo> newFiles) { List<FileInfo> newFiles) {

2
telephony/java/android/telephony/mbms/vendor/MbmsDownloadServiceBase.java vendored
View File

@@ -18,6 +18,7 @@ package android.telephony.mbms.vendor;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.content.Intent; import android.content.Intent;
import android.os.Binder; import android.os.Binder;
import android.os.IBinder; import android.os.IBinder;
@@ -42,6 +43,7 @@ import java.util.Map;
* @hide * @hide
*/ */
@SystemApi @SystemApi
@TestApi
public class MbmsDownloadServiceBase extends IMbmsDownloadService.Stub { public class MbmsDownloadServiceBase extends IMbmsDownloadService.Stub {
private final Map<IBinder, DownloadStateCallback> mDownloadCallbackBinderMap = new HashMap<>(); private final Map<IBinder, DownloadStateCallback> mDownloadCallbackBinderMap = new HashMap<>();
private final Map<IBinder, DeathRecipient> mDownloadCallbackDeathRecipients = new HashMap<>(); private final Map<IBinder, DeathRecipient> mDownloadCallbackDeathRecipients = new HashMap<>();