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

Commit d7829d80 authored by paulhu's avatar paulhu
Browse files

Support radio HAL V1.4 DataProfileInfo 

Protocol type has changed from string to integer in @1.4
DataProfileInfo, need to adjust convertToHalDataProfile14 method
in RIL.java

Bug: 113505704
Test: Build pass and data call can setup normally.
Change-Id: If687562494ed7efe9991de476addc4167c87f117
parent ef96bb25

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -89,6 +89,7 @@ import android.telephony.SignalStrength; 
import android.telephony.SmsManager;

import android.telephony.SmsManager;

import android.telephony.TelephonyHistogram;

import android.telephony.TelephonyHistogram;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.telephony.data.ApnSetting;

import android.telephony.data.DataProfile;

import android.telephony.data.DataProfile;

import android.telephony.data.DataService;

import android.telephony.data.DataService;

import android.text.TextUtils;

import android.text.TextUtils;
@@ -1256,8 +1257,8 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                new android.hardware.radio.V1_4.DataProfileInfo();

                new android.hardware.radio.V1_4.DataProfileInfo();





        dpi.apn = dp.getApn();

        dpi.apn = dp.getApn();

        dpi.protocol = dp.getProtocol();

        dpi.protocol = ApnSetting.getProtocolIntFromString(dp.getProtocol());

        dpi.roamingProtocol = dp.getRoamingProtocol();

        dpi.roamingProtocol = ApnSetting.getProtocolIntFromString(dp.getRoamingProtocol());

        dpi.authType = dp.getAuthType();

        dpi.authType = dp.getAuthType();

        dpi.user = dp.getUserName();

        dpi.user = dp.getUserName();

        dpi.password = dp.getPassword();

        dpi.password = dp.getPassword();