commit 9f735adab693e49555782365ae58a989da9cde73
author Frank Zhang <a21122@motorola.com> Mon Nov 25 15:54:39 2019 -0600
committer Tyler Gunn <tgunn@google.com> Tue Mar 31 15:42:51 2020 +0000
tree b640d011830832fe2bce71316c965d0045217aad
parent 929f3d682e0ce546f695e13896526ddd65d3a6d5

Phone process crashes during the stability test.

[Description]
During a stability test, a NPE was thrown during a call.

[Root cause]
The method Connection.getAddress() might return null.

[Solution]
Add safe check before using Connection.getAddress().

Fixes: 145146245
Test: Run Telephony unit tests
Change-Id: Ia576bc0958811c8b38697869c594c70b0be0c2f3

src/com/android/services/telephony/CdmaConnection.java

diff --git a/src/com/android/services/telephony/CdmaConnection.java b/src/com/android/services/telephony/CdmaConnection.java
index bd015e3..36618c5 100644
--- a/src/com/android/services/telephony/CdmaConnection.java
+++ b/src/com/android/services/telephony/CdmaConnection.java
@@ -288,9 +288,8 @@
 
     private boolean isEmergency() {
         Phone phone = getPhone();
-        return phone != null &&
-                PhoneNumberUtils.isLocalEmergencyNumber(
-                    phone.getContext(), getAddress().getSchemeSpecificPart());
+        return phone != null && getAddress() != null && PhoneNumberUtils.isLocalEmergencyNumber(
+                phone.getContext(), getAddress().getSchemeSpecificPart());
     }
 
     /**

src/com/android/services/telephony/TelephonyConnectionService.java

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 0b60e37..16e10cf 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -1639,7 +1639,10 @@
 
     private void placeOutgoingConnection(
             TelephonyConnection connection, Phone phone, int videoState, Bundle extras) {
-        String number = connection.getAddress().getSchemeSpecificPart();
+
+        String number = (connection.getAddress() != null)
+                ? connection.getAddress().getSchemeSpecificPart()
+                : "";
 
         com.android.internal.telephony.Connection originalConnection = null;
         try {