Merge "Revert "Need to check empty not null for String"" am: 8c64274ee6 am: 622d3051b3 (2e96a44f) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SignalStrength.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@ import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.telephony.CarrierConfigManager;
		import android.text.TextUtils;
		import android.util.Log;
		import android.content.res.Resources;

		import java.util.ArrayList;
		import java.util.Arrays;
		@@ -1121,7 +1121,7 @@ public class SignalStrength implements Parcelable {
		public int getWcdmaLevel() {
		int level = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;

		if (TextUtils.isEmpty(mWcdmaDefaultSignalMeasurement)) {
		if (mWcdmaDefaultSignalMeasurement == null) {
		Log.wtf(LOG_TAG, "getWcdmaLevel - WCDMA default signal measurement is invalid.");
		return level;
		}