From 07f1843e2831aac5ac54f35eb62d09899177c65f Mon Sep 17 00:00:00 2001
From: Hall Liu <hallliu@google.com>
Date: Tue, 10 Apr 2018 14:04:12 -0700
Subject: [PATCH] Make setServiceId a TestApi

Bug: 77152869
Test: CTS
Change-Id: I26f60b48865953971de02c50db48e0ff66f4e2a0
---
 api/test-current.txt                                       | 4 ++++
 telephony/java/android/telephony/mbms/DownloadRequest.java | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/api/test-current.txt b/api/test-current.txt
index 94154c2c92a90..6d26510a02beb 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -875,6 +875,10 @@ package android.telephony {
 
 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 {
     ctor public FileInfo(android.net.Uri, java.lang.String);
   }
diff --git a/telephony/java/android/telephony/mbms/DownloadRequest.java b/telephony/java/android/telephony/mbms/DownloadRequest.java
index 602c796aa188c..9e3302bd07e04 100644
--- a/telephony/java/android/telephony/mbms/DownloadRequest.java
+++ b/telephony/java/android/telephony/mbms/DownloadRequest.java
@@ -18,6 +18,7 @@ package android.telephony.mbms;
 
 import android.annotation.NonNull;
 import android.annotation.SystemApi;
+import android.annotation.TestApi;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Parcel;
@@ -184,6 +185,7 @@ public final class DownloadRequest implements Parcelable {
          * @hide
          */
         @SystemApi
+        @TestApi
         public Builder setServiceId(String serviceId) {
             fileServiceId = serviceId;
             return this;