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

Commit b4cd9d7f authored by sqian's avatar sqian
Browse files

resolve merge conflicts of 7c121bee to stage-aosp-master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I3154f6d332db1558bc96d25bb448c6a5d99068d0
parents 2e4aad90 7c121bee

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

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

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;



import com.android.internal.telephony.dataconnection.DataCallResponse;

import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;
@@ -1329,11 +1330,11 @@ public class RadioResponse extends IRadioResponse.Stub { 
                    dc.uusInfo = new UUSInfo();

                    dc.uusInfo.setType(calls.get(i).uusInfo.get(0).uusType);

                    dc.uusInfo.setDcs(calls.get(i).uusInfo.get(0).uusDcs);

                    if (calls.get(i).uusInfo.get(0).uusData != null) {

                    if (!TextUtils.isEmpty(calls.get(i).uusInfo.get(0).uusData)) {

                        byte[] userData = calls.get(i).uusInfo.get(0).uusData.getBytes();

                        dc.uusInfo.setUserData(userData);

                    } else {

                        mRil.riljLog("responseCurrentCalls: uusInfo data is null");

                        mRil.riljLog("responseCurrentCalls: uusInfo data is null or empty");

                    }



                    mRil.riljLogv(String.format("Incoming UUS : type=%d, dcs=%d, length=%d",

src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java

+5 −4
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.SystemClock; 
import android.telephony.Rlog;

import android.telephony.ServiceState;

import android.telephony.TelephonyHistogram;

import android.text.TextUtils;

import android.util.Base64;

import android.util.SparseArray;
@@ -1059,10 +1060,10 @@ public class TelephonyMetrics { 
        for (int i = 0; i < dcsList.size(); i++) {

            dataCalls[i] = new RilDataCall();

            dataCalls[i].cid = dcsList.get(i).cid;

            if (dcsList.get(i).ifname != null) {

            if (!TextUtils.isEmpty(dcsList.get(i).ifname)) {

                dataCalls[i].iframe = dcsList.get(i).ifname;

            }

            if (dcsList.get(i).type != null) {

            if (!TextUtils.isEmpty(dcsList.get(i).type)) {

                dataCalls[i].type = toPdpType(dcsList.get(i).type);

            }

        }
@@ -1311,11 +1312,11 @@ public class TelephonyMetrics { 
            setupDataCallResponse.suggestedRetryTimeMillis = response.suggestedRetryTime;



            dataCall.cid = response.cid;

            if (response.type != null) {

            if (!TextUtils.isEmpty(response.type)) {

                dataCall.type = toPdpType(response.type);

            }



            if (response.ifname != null) {

            if (!TextUtils.isEmpty(response.ifname)) {

                dataCall.iframe = response.ifname;

            }

        }