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

Commit a0d9fe14 authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

Merge "Remove DataRegStateResult v1.4 from CellularNetworkService" am: fd3fcf65 

am: d1485221

Change-Id: I3e13832497b26c670ea7a457eab428388f71d132
parents 5179aa48 d1485221

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

+0 −19
Original line number Diff line number Diff line
@@ -294,26 +294,7 @@ public class CellularNetworkService extends NetworkService { 
                        accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,

                        cellIdentity, maxDataCalls, false /* isDcNrRestricted */,

                        false /* isNrAvailable */);

            } else if (result instanceof android.hardware.radio.V1_4.DataRegStateResult) {

                android.hardware.radio.V1_4.DataRegStateResult dataRegState =

                        (android.hardware.radio.V1_4.DataRegStateResult) result;

                int regState = getRegStateFromHalRegState(dataRegState.base.regState);

                int accessNetworkTechnology = getAccessNetworkTechnologyFromRat(

                        dataRegState.base.rat);

                int reasonForDenial = dataRegState.base.reasonDataDenied;

                boolean emergencyOnly = isEmergencyOnly(dataRegState.base.regState);

                int maxDataCalls = dataRegState.base.maxDataCalls;

                int[] availableServices = getAvailableServices(regState, domain, emergencyOnly);

                CellIdentity cellIdentity =

                        convertHalCellIdentityToCellIdentity(dataRegState.base.cellIdentity);

                boolean isDcNrRestricted = dataRegState.isDcNrRestricted;

                boolean isNrAvailable = dataRegState.isNrAvailable;

                return new NetworkRegistrationState(domain, transportType, regState,

                        accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,

                        cellIdentity, maxDataCalls, isDcNrRestricted, isNrAvailable);



            }



            return null;

        }