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

Commit 85fa2e57 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Map RadioTechnologyFamily to radio type correctly" am: 14beebbd 

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

Change-Id: I53e7dadfa098501ccd95adb7118a74b11dbd2c7a
parents e036ac95 14beebbd

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

+7 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.hardware.radio.V1_0.LceStatusInfo; 
import android.hardware.radio.V1_0.NeighboringCell;

import android.hardware.radio.V1_0.RadioError;

import android.hardware.radio.V1_0.RadioResponseInfo;

import android.hardware.radio.V1_0.RadioTechnologyFamily;

import android.hardware.radio.V1_0.SendSmsResult;

import android.hardware.radio.V1_0.VoiceRegStateResult;

import android.hardware.radio.V1_4.CarrierRestrictionsWithPriority;
@@ -1290,7 +1291,12 @@ public class RadioResponse extends IRadioResponse.Stub { 
     */

    public void getImsRegistrationStateResponse(RadioResponseInfo responseInfo,

                                                boolean isRegistered, int ratFamily) {

        responseInts(responseInfo, isRegistered ? 1 : 0, ratFamily);

        responseInts(

                responseInfo,

                isRegistered ? 1 : 0,

                ratFamily == RadioTechnologyFamily.THREE_GPP

                        ? PhoneConstants.PHONE_TYPE_GSM

                        : PhoneConstants.PHONE_TYPE_CDMA);

    }



    /**