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

Commit 7c121bee authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Check string variable against both empty and null string"

parents 63a4e77c 4bf628e0

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
@@ -40,6 +40,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;
@@ -1007,10 +1008,10 @@ public class TelephonyMetrics { 
        for (int i = 0; i < dcsList.size(); i++) {

            dataCalls[i] = new RilDataCall();

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

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

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

                dataCalls[i].setIframe(dcsList.get(i).ifname);

            }

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

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

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

            }

        }
@@ -1249,11 +1250,11 @@ public class TelephonyMetrics { 
            setupDataCallResponse.setSuggestedRetryTimeMillis(response.suggestedRetryTime);



            dataCall.setCid(response.cid);

            if (response.type != null) {

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

                dataCall.setType(toPdpType(response.type));

            }



            if (response.ifname != null) {

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

                dataCall.setIframe(response.ifname);

            }

        }