Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04a332ce authored by Sarah Chin's avatar Sarah Chin Committed by android-build-merger
Browse files

Merge "Change defaults for FREQUENCY_RANGE and NR_STATE" 

am: 9146586e

Change-Id: I8c7ecdd2ef6c1001537d1f06b39daa7713dfcfee
parents 10fd57e6 9146586e

telephony/java/android/telephony/NetworkRegistrationInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -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

telephony/java/android/telephony/ServiceState.java

+1 −1
Original line number Diff line number Diff line
@@ -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.