summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chen Xu <fionaxu@google.com> 2018-11-01 13:46:37 -0700
committer android-build-merger <android-build-merger@google.com> 2018-11-01 13:46:37 -0700
commit2e96a44f27d1c173d698bc65e1c90eb80d534ab8 (patch)
treec11e6b9915c83cf2a30e754bfb8387e28d638ea9
parent1526091844297954b4525e8561ce366cd32663f6 (diff)
parent01dba7052f56d4562c05527f11cda694505bf317 (diff)
Merge "Revert "Need to check empty not null for String"" am: 8c64274ee6 am: 622d3051b3
am: 01dba7052f Change-Id: Id435dde94aaaa12f3fbcba0c3159788ecce372c3
-rw-r--r--telephony/java/android/telephony/SignalStrength.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
index def5e7d87108..bc832c3fbfa5 100644
--- a/telephony/java/android/telephony/SignalStrength.java
+++ b/telephony/java/android/telephony/SignalStrength.java
@@ -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;
}