commit 04a332ce6f51911ba9ecc69e8f39cc38134d0f00
author Sarah Chin <sarahchin@google.com> Thu Dec 12 14:15:12 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 12 14:15:12 2019 -0800
tree 73d40466f26d2fe6ef6d93b9ac5007b5e4b423b4
parent 10fd57e65962f002bf9e33c1bb11a44dace76b3e
parent 9146586e64710b0c58003ef6e97155e597af27c3

Merge "Change defaults for FREQUENCY_RANGE and NR_STATE"
am: 9146586e64

Change-Id: I8c7ecdd2ef6c1001537d1f06b39daa7713dfcfee

telephony/java/android/telephony/NetworkRegistrationInfo.java

diff --git a/telephony/java/android/telephony/NetworkRegistrationInfo.java b/telephony/java/android/telephony/NetworkRegistrationInfo.java
index bbf746fc..fc717e7 100644
--- a/telephony/java/android/telephony/NetworkRegistrationInfo.java
+++ b/telephony/java/android/telephony/NetworkRegistrationInfo.java
@@ -24,8 +24,8 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.telephony.AccessNetworkConstants.TransportType;
-
 import android.telephony.Annotation.NetworkType;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -90,7 +90,7 @@
      * Dual Connectivity(EN-DC).
      * @hide
      */
-    public static final int NR_STATE_NONE = -1;
+    public static final int NR_STATE_NONE = 0;
 
     /**
      * The device is camped on an LTE cell that supports E-UTRA-NR Dual Connectivity(EN-DC) but

telephony/java/android/telephony/ServiceState.java

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 1e601cf..9ace86c 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -102,7 +102,7 @@
      * Indicates frequency range is unknown.
      * @hide
      */
-    public static final int FREQUENCY_RANGE_UNKNOWN = -1;
+    public static final int FREQUENCY_RANGE_UNKNOWN = 0;
 
     /**
      * Indicates the frequency range is below 1GHz.