commit f959d1084eae42af1403d9c3f423143869a2f6cb
author Robert Greenwalt <rgreenwalt@google.com> Thu Aug 02 16:06:56 2012 -0700
committer The Android Automerger <android-build@android.com> Mon Aug 06 13:09:55 2012 -0700
tree 73adb5978eb576d0f7aa215197af3d1885f879eb
parent 0e51c94c98fe69d7183f7fccaa35c0f46fd8e3f2

Fix a logging NPE problem

bug:6864064
Change-Id: I3237e55cb164462b9616515b0de009bf687f1dca

telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
index 25cd112..564ce3b 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 @@
                 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);
             }