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

Commit 20dbf959 authored by Hunsuk Choi's avatar Hunsuk Choi
Browse files

Rename EmergencyRegResult to EmergencyRegistrationResult 

Per API council's request

Bug: 324064089
Test: build
Change-Id: I55a3dca921c58c59d130c2f22c844bd38d0745ab
parent 3fcc6093

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

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import android.telephony.BarringInfo; 
import android.telephony.CellIdentity;

import android.telephony.CellInfo;

import android.telephony.CellularIdentifierDisclosure;

import android.telephony.EmergencyRegResult;

import android.telephony.EmergencyRegistrationResult;

import android.telephony.LinkCapacityEstimate;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.PhysicalChannelConfig;
@@ -415,7 +415,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
            android.hardware.radio.network.EmergencyRegResult result) {

        mRil.processIndication(HAL_SERVICE_NETWORK, indicationType);



        EmergencyRegResult response = RILUtils.convertHalEmergencyRegResult(result);

        EmergencyRegistrationResult response = RILUtils.convertHalEmergencyRegResult(result);



        if (mRil.isLogOrTrace()) {

            mRil.unsljLogRet(RIL_UNSOL_EMERGENCY_NETWORK_SCAN_RESULT, response);

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

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.hardware.radio.network.IRadioNetworkResponse; 
import android.os.AsyncResult;

import android.telephony.BarringInfo;

import android.telephony.CellInfo;

import android.telephony.EmergencyRegResult;

import android.telephony.EmergencyRegistrationResult;

import android.telephony.RadioAccessSpecifier;

import android.telephony.SignalStrength;
@@ -429,7 +429,7 @@ public class NetworkResponse extends IRadioNetworkResponse.Stub { 
        RILRequest rr = mRil.processResponse(HAL_SERVICE_NETWORK, responseInfo);



        if (rr != null) {

            EmergencyRegResult response = RILUtils.convertHalEmergencyRegResult(regState);

            EmergencyRegistrationResult response = RILUtils.convertHalEmergencyRegResult(regState);

            if (responseInfo.error == RadioError.NONE) {

                RadioResponse.sendMessageResponse(rr.mResult, response);

            }

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

+6 −6
Original line number Diff line number Diff line
@@ -305,10 +305,10 @@ import android.net.LinkAddress; 
import android.net.LinkProperties;

import android.os.SystemClock;

import android.service.carrier.CarrierIdentifier;

import android.telephony.CarrierInfo;

import android.telephony.AccessNetworkConstants;

import android.telephony.Annotation;

import android.telephony.BarringInfo;

import android.telephony.CarrierInfo;

import android.telephony.CarrierRestrictionRules;

import android.telephony.CellConfigLte;

import android.telephony.CellIdentity;
@@ -335,7 +335,7 @@ import android.telephony.CellSignalStrengthWcdma; 
import android.telephony.CellularIdentifierDisclosure;

import android.telephony.ClosedSubscriberGroupInfo;

import android.telephony.DomainSelectionService;

import android.telephony.EmergencyRegResult;

import android.telephony.EmergencyRegistrationResult;

import android.telephony.LinkCapacityEstimate;

import android.telephony.ModemInfo;

import android.telephony.NetworkRegistrationInfo;
@@ -4546,13 +4546,13 @@ public class RILUtils { 
    }



    /**

     * Convert EmergencyRegResult.aidl to EmergencyRegResult.

     * Convert EmergencyRegResult.aidl to EmergencyRegistrationResult.

     * @param halResult EmergencyRegResult.aidl in HAL.

     * @return Converted EmergencyRegResult.

     * @return Converted EmergencyRegistrationResult.

     */

    public static EmergencyRegResult convertHalEmergencyRegResult(

    public static EmergencyRegistrationResult convertHalEmergencyRegResult(

            android.hardware.radio.network.EmergencyRegResult halResult) {

        return new EmergencyRegResult(

        return new EmergencyRegistrationResult(

                halResult.accessNetwork,

                convertHalRegState(halResult.regState),

                halResult.emcDomain,

src/java/com/android/internal/telephony/domainselection/DomainSelectionConnection.java

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import android.telephony.DisconnectCause; 
import android.telephony.DomainSelectionService;

import android.telephony.DomainSelectionService.EmergencyScanType;

import android.telephony.DomainSelector;

import android.telephony.EmergencyRegResult;

import android.telephony.EmergencyRegistrationResult;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.data.ApnSetting;

import android.util.LocalLog;
@@ -232,7 +232,7 @@ public class DomainSelectionConnection { 
            switch (msg.what) {

                case EVENT_EMERGENCY_NETWORK_SCAN_RESULT:

                    ar = (AsyncResult) msg.obj;

                    EmergencyRegResult regResult = (EmergencyRegResult) ar.result;

                    EmergencyRegistrationResult regResult = (EmergencyRegistrationResult) ar.result;

                    if (DBG) logd("EVENT_EMERGENCY_NETWORK_SCAN_RESULT result=" + regResult);

                    synchronized (mLock) {

                        clearState(STATUS_WAIT_SCAN_RESULT);
@@ -377,7 +377,7 @@ public class DomainSelectionConnection { 
     *

     * @return The {@link IWwanSelectorResultCallback} interface.

     */

    public @Nullable IWwanSelectorResultCallback getEmergencyRegResultCallback() {

    public @Nullable IWwanSelectorResultCallback getWwanSelectorResultCallback() {

        return mResultCallback;

    }

src/java/com/android/internal/telephony/domainselection/EmergencyCallDomainSelectionConnection.java

+5 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import android.telephony.AccessNetworkConstants.TransportType; 
import android.telephony.Annotation.DisconnectCauses;

import android.telephony.Annotation.NetCapability;

import android.telephony.DomainSelectionService;

import android.telephony.EmergencyRegResult;

import android.telephony.EmergencyRegistrationResult;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.data.ApnSetting;

import android.telephony.ims.ImsReasonInfo;
@@ -213,7 +213,7 @@ public class EmergencyCallDomainSelectionConnection extends DomainSelectionConne 
            int slotId, int subId, boolean exited,

            @NonNull String callId, @NonNull String number, boolean isTest,

            int callFailCause, @Nullable ImsReasonInfo imsReasonInfo,

            @Nullable EmergencyRegResult emergencyRegResult) {

            @Nullable EmergencyRegistrationResult emergencyRegResult) {

        DomainSelectionService.SelectionAttributes.Builder builder =

                new DomainSelectionService.SelectionAttributes.Builder(

                        slotId, subId, SELECTOR_TYPE_CALLING)
@@ -225,7 +225,7 @@ public class EmergencyCallDomainSelectionConnection extends DomainSelectionConne 
                .setCsDisconnectCause(callFailCause);



        if (imsReasonInfo != null) builder.setPsDisconnectCause(imsReasonInfo);

        if (emergencyRegResult != null) builder.setEmergencyRegResult(emergencyRegResult);

        if (emergencyRegResult != null) builder.setEmergencyRegistrationResult(emergencyRegResult);



        return builder.build();

    }
@@ -244,7 +244,8 @@ public class EmergencyCallDomainSelectionConnection extends DomainSelectionConne 
                .setEmergency(true)

                .setTestEmergencyNumber(attr.isTestEmergencyNumber())

                .setExitedFromAirplaneMode(attr.isExitedFromAirplaneMode())

                .setEmergencyRegResult(new EmergencyRegResult(AccessNetworkType.UNKNOWN,

                .setEmergencyRegistrationResult(

                        new EmergencyRegistrationResult(AccessNetworkType.UNKNOWN,

                        NetworkRegistrationInfo.REGISTRATION_STATE_UNKNOWN,

                        NetworkRegistrationInfo.DOMAIN_UNKNOWN, false, false, 0, 0,

                        "", "", ""));