summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2012-08-02 16:06:56 -0700
committerThe Android Automerger <android-build@android.com>2012-08-06 13:09:55 -0700
commitf959d1084eae42af1403d9c3f423143869a2f6cb (patch)
tree73adb5978eb576d0f7aa215197af3d1885f879eb
parent0e51c94c98fe69d7183f7fccaa35c0f46fd8e3f2 (diff)
downloadbase-f959d1084eae42af1403d9c3f423143869a2f6cb.tar.gz
Fix a logging NPE problemandroid-4.1.1_r5
bug:6864064 Change-Id: I3237e55cb164462b9616515b0de009bf687f1dca
-rwxr-xr-xtelephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
index 25cd1126ec19..564ce3bd8cd0 100755
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
@@ -1378,7 +1378,8 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
mZoneTime = c.getTimeInMillis();
}
if (DBG) {
- log("NITZ: tzOffset=" + tzOffset + " dst=" + dst + " zone=" + zone.getID() +
+ log("NITZ: tzOffset=" + tzOffset + " dst=" + dst + " zone=" +
+ (zone!=null ? zone.getID() : "NULL") +
" iso=" + iso + " mGotCountryCode=" + mGotCountryCode +
" mNeedFixZone=" + mNeedFixZone);
}