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

Merge "Make setServiceId a TestApi" into pi-dev

Browse Source 
am: d41e669fca

Change-Id: I0ca985c9741b3f710c636595b7eb9b2b326e67fb
This commit is contained in:
Hall Liu
2018-04-11 13:30:18 -07:00
committed by android-build-merger
parent 64ab0490c0 d41e669fca
commit 035b4827ca
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/test-current.txt
View File

@@ -917,6 +917,10 @@ package android.telephony {
package android.telephony.mbms { package android.telephony.mbms {
public static class DownloadRequest.Builder {
method public android.telephony.mbms.DownloadRequest.Builder setServiceId(java.lang.String);
}
public final class FileInfo implements android.os.Parcelable { public final class FileInfo implements android.os.Parcelable {
ctor public FileInfo(android.net.Uri, java.lang.String); ctor public FileInfo(android.net.Uri, java.lang.String);
} }

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

@@ -18,6 +18,7 @@ package android.telephony.mbms;
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.net.Uri; import android.net.Uri;
import android.os.Parcel; import android.os.Parcel;
@@ -184,6 +185,7 @@ public final class DownloadRequest implements Parcelable {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@TestApi
public Builder setServiceId(String serviceId) { public Builder setServiceId(String serviceId) {
fileServiceId = serviceId; fileServiceId = serviceId;
return this; return this;