Skip to content

Commit f959d10

Browse files
Robert GreenwaltThe Android Automerger
authored andcommitted
Fix a logging NPE problem
bug:6864064 Change-Id: I3237e55cb164462b9616515b0de009bf687f1dca
1 parent 0e51c94 commit f959d10

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,8 @@ void setTimeFromNITZString (String nitz, long nitzReceiveTime)
13781378
mZoneTime = c.getTimeInMillis();
13791379
}
13801380
if (DBG) {
1381-
log("NITZ: tzOffset=" + tzOffset + " dst=" + dst + " zone=" + zone.getID() +
1381+
log("NITZ: tzOffset=" + tzOffset + " dst=" + dst + " zone=" +
1382+
(zone!=null ? zone.getID() : "NULL") +
13821383
" iso=" + iso + " mGotCountryCode=" + mGotCountryCode +
13831384
" mNeedFixZone=" + mNeedFixZone);
13841385
}

0 commit comments

Comments
 (0)