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

Commit bc971e93 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Move definitions from CdmaEriInformation to TelephonyManager" am:... 

Merge "Move definitions from CdmaEriInformation to TelephonyManager" am: feab0845 am: 27ee6117 am: fb02ea3c

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1505154

Change-Id: Ib880d727499bebbfe9de822ff32cb0cac49888ee
parents fceaa0d9 fb02ea3c

src/java/com/android/internal/telephony/cdma/EriInfo.java

+6 −6
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 


package com.android.internal.telephony.cdma;



import android.telephony.CdmaEriInformation;

import android.telephony.TelephonyManager;



public final class EriInfo {



    public static final int ROAMING_INDICATOR_ON    = CdmaEriInformation.ERI_ON;

    public static final int ROAMING_INDICATOR_OFF   = CdmaEriInformation.ERI_OFF;

    public static final int ROAMING_INDICATOR_FLASH = CdmaEriInformation.ERI_FLASH;

    public static final int ROAMING_INDICATOR_ON    = TelephonyManager.ERI_ON;

    public static final int ROAMING_INDICATOR_OFF   = TelephonyManager.ERI_OFF;

    public static final int ROAMING_INDICATOR_FLASH = TelephonyManager.ERI_FLASH;



    public static final int ROAMING_ICON_MODE_NORMAL    = CdmaEriInformation.ERI_ICON_MODE_NORMAL;

    public static final int ROAMING_ICON_MODE_FLASH     = CdmaEriInformation.ERI_ICON_MODE_FLASH;

    public static final int ROAMING_ICON_MODE_NORMAL    = TelephonyManager.ERI_ICON_MODE_NORMAL;

    public static final int ROAMING_ICON_MODE_FLASH     = TelephonyManager.ERI_ICON_MODE_FLASH;



    public int roamingIndicator;

    public int iconIndex;