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

Commit 1a22d0b4 authored by Paul Hu's avatar Paul Hu Committed by android-build-merger
Browse files

Merge "Support radio HAL V1.4 DataProfileInfo" 

am: 0e4e7486

Change-Id: I781ca3855f036f0f68618d77d1305ea69f071599
parents 62dfe2ef 0e4e7486

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

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

import android.telephony.TelephonyHistogram;

import android.telephony.TelephonyManager;

import android.telephony.data.ApnSetting;

import android.telephony.data.DataProfile;

import android.telephony.data.DataService;

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



        dpi.apn = dp.getApn();

        dpi.protocol = dp.getProtocol();

        dpi.roamingProtocol = dp.getRoamingProtocol();

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

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

        dpi.authType = dp.getAuthType();

        dpi.user = dp.getUserName();

        dpi.password = dp.getPassword();