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

Commit 6935afb3 authored by Amruth Ramachandran's avatar Amruth Ramachandran Committed by android-build-merger
Browse files

Merge "Fix AccessRat check for LteVopsInfo" am: 38b7ab8d 

am: 8d61e4b8

Change-Id: I4f07d9e4ade2e3a48c0b922d1f8e13b7c44240b2
parents 60ce8c84 8d61e4b8

src/java/com/android/internal/telephony/CellularNetworkService.java

+6 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.internal.telephony; 


import android.hardware.radio.V1_0.CellInfoType;

import android.hardware.radio.V1_0.RegState;

import android.hardware.radio.V1_4.DataRegStateResult.VopsInfo.hidl_discriminator;

import android.os.AsyncResult;

import android.os.Handler;

import android.os.HandlerThread;
@@ -317,7 +318,11 @@ public class CellularNetworkService extends NetworkService { 
                CellIdentity cellIdentity =

                        convertHalCellIdentityToCellIdentity(dataRegState.base.cellIdentity);

                android.hardware.radio.V1_4.NrIndicators nrIndicators = dataRegState.nrIndicators;

                if (AccessNetworkType.EUTRAN == accessNetworkTechnology) {



                // Check for lteVopsInfo only if its initialized and RAT is EUTRAN

                if (dataRegState.vopsInfo.getDiscriminator() == hidl_discriminator.lteVopsInfo

                        && ServiceState.rilRadioTechnologyToAccessNetworkType(dataRegState.base.rat)

                            == AccessNetworkType.EUTRAN) {

                    android.hardware.radio.V1_4.LteVopsInfo vopsSupport =

                            dataRegState.vopsInfo.lteVopsInfo();

                    lteVopsSupportInfo = convertHalLteVopsSupportInfo(vopsSupport.isVopsSupported,