From f3f89d0c2b311d1369a3c986b97e2f3e87bd35fc Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Mon, 25 Mar 2019 07:26:33 -0700 Subject: [PATCH] Fix potential NPE in telephony registry dumpsys. There is no guarantee that mImsCallDisconnectCause will be non-null, so we should not be calling toString here. Test: Compile/build Fixes: 129251351 Change-Id: I8b983ce8fa7f5316bc474ffbd67052ae0df4d75d --- services/core/java/com/android/server/TelephonyRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index e78ae5547b5ae..d7686aeb8b380 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -1883,7 +1883,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { pw.println("mDataConnectionState=" + mDataConnectionState[i]); pw.println("mCellLocation=" + mCellLocation[i]); pw.println("mCellInfo=" + mCellInfo.get(i)); - pw.println("mImsCallDisconnectCause=" + mImsReasonInfo.get(i).toString()); + pw.println("mImsCallDisconnectCause=" + mImsReasonInfo.get(i)); pw.decreaseIndent(); } pw.println("mCallNetworkType=" + mCallNetworkType);