commit ad286893ed017a59d94dba1dc4c08daf24d43118
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 09 00:07:38 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 09 00:07:38 2019 +0000
tree a859b388c172dab63033816cc4b58f56b8de91c1
parent b68b541c1b7419fec70d88c2adcc152deeff5adc
parent e1e585bba5f44122cc8c7ca95c49fa7e458c9e79

Merge "Add missing null check on start of SipIncomingCallReceiver received."

sip/src/com/android/services/telephony/sip/SipIncomingCallReceiver.java

diff --git a/sip/src/com/android/services/telephony/sip/SipIncomingCallReceiver.java b/sip/src/com/android/services/telephony/sip/SipIncomingCallReceiver.java
index c754ae4..19f5882 100644
--- a/sip/src/com/android/services/telephony/sip/SipIncomingCallReceiver.java
+++ b/sip/src/com/android/services/telephony/sip/SipIncomingCallReceiver.java
@@ -25,6 +25,7 @@
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
+import android.text.TextUtils;
 import android.util.Log;
 
 /**
@@ -38,6 +39,11 @@
     public void onReceive(Context context, final Intent intent) {
         String action = intent.getAction();
 
+        if (TextUtils.isEmpty(action)) {
+            log("SipIncomingCallReceiver called with no action");
+            return;
+        }
+
         if (!isRunningInSystemUser()) {
             if (VERBOSE) log("SipIncomingCallReceiver only run in system user, ignore " + action);
             return;