commit a9c0419010c9c0054f0e3320f3a621174c0d7e01
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 16 17:39:38 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 16 17:39:38 2018 +0000
tree b7d0b5daf31ffe90c0639d7922394e0d7b7a9d45
parent cdbf930883420342d29fb4e194d4a35223c28d36
parent 260f2fa1fe0e439cbbb31b5d6ede3510ed773537

Merge "Added CTS test cases for getNetworkId() and getSystemId()"

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index bf3d0c2..1448b2a 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -436,6 +436,10 @@
     field public static final java.lang.String MBMS_STREAMING_SERVICE_OVERRIDE_METADATA = "mbms-streaming-service-override";
   }
 
+  public class ServiceState implements android.os.Parcelable {
+    method public void setSystemAndNetworkId(int, int);
+  }
+
 }
 
 package android.telephony.mbms {

telephony/java/android/telephony/ServiceState.java

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index d2e7ae5..a9c1cf6 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -19,6 +19,7 @@
 import android.annotation.IntDef;
 import android.annotation.Nullable;
 import android.annotation.SystemApi;
+import android.annotation.TestApi;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -1220,6 +1221,7 @@
     }
 
     /** @hide */
+    @TestApi
     public void setSystemAndNetworkId(int systemId, int networkId) {
         this.mSystemId = systemId;
         this.mNetworkId = networkId;