summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sarah Chin <sarahchin@google.com> 2019-10-17 14:59:59 -0700
committer Sarah Chin <sarahchin@google.com> 2019-10-18 11:31:12 -0700
commit65277dfec2cade99a872ebd1400b41aee265454c (patch)
tree23af6412a47044130b78c033d519d2a30bdfa717
parente4f30281d23334d06207f7a2cd4d7e8f22797502 (diff)
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
-rw-r--r--telephony/java/android/telephony/NetworkRegistrationInfo.java4
-rw-r--r--telephony/java/android/telephony/ServiceState.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/NetworkRegistrationInfo.java b/telephony/java/android/telephony/NetworkRegistrationInfo.java
index 3e028715fd6d..56b723631115 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 1d00b4f51fdc..f5033487ad1f 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.