From 65277dfec2cade99a872ebd1400b41aee265454c Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Thu, 17 Oct 2019 14:59:59 -0700
Subject: [PATCH] Change defaults for FREQUENCY_RANGE and NR_STATE

Change value from -1 to 0 to match proto

Bug: 141323073
Test: atest TelephonyMetricsTest
Change-Id: I4509f22cdae656de3ad011de3a1664e27d35986a
---
 telephony/java/android/telephony/NetworkRegistrationInfo.java | 4 ++--
 telephony/java/android/telephony/ServiceState.java            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/telephony/java/android/telephony/NetworkRegistrationInfo.java b/telephony/java/android/telephony/NetworkRegistrationInfo.java
index 3e028715fd6d2..56b7236311155 100644
--- a/telephony/java/android/telephony/NetworkRegistrationInfo.java
+++ b/telephony/java/android/telephony/NetworkRegistrationInfo.java
@@ -24,8 +24,8 @@ import android.annotation.TestApi;
 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 @@ public final class NetworkRegistrationInfo implements Parcelable {
      * 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
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 1d00b4f51fdcb..f5033487ad1fd 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -102,7 +102,7 @@ public class ServiceState implements Parcelable {
      * 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.