commit acd3edd57d00e4cb3debc7f7c41ddc0a7bd963dc
author Jack Yu <jackyu@google.com> Tue Jun 22 17:00:27 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 22 17:00:27 2021 +0000
tree 1467fb8758bb5f50f106447de71691956ec38584
parent 899c5fee6500de42ba95545f5482a9f6ca3b395c
parent 3137944673aa09ba5790cfaee00d4565b7184dda

Merge "Add null check to RadioInterfaceCapabilityController"

src/java/com/android/internal/telephony/RadioInterfaceCapabilityController.java

diff --git a/src/java/com/android/internal/telephony/RadioInterfaceCapabilityController.java b/src/java/com/android/internal/telephony/RadioInterfaceCapabilityController.java
index 99ffe36..de62c70 100644
--- a/src/java/com/android/internal/telephony/RadioInterfaceCapabilityController.java
+++ b/src/java/com/android/internal/telephony/RadioInterfaceCapabilityController.java
@@ -123,6 +123,10 @@
                     if (ar.exception != null) {
                         loge("setupRadioInterfaceCapabilities: " + ar.exception);
                     }
+                    if (ar.result == null) {
+                        loge("setupRadioInterfaceCapabilities: ar.result is null");
+                        return;
+                    }
                     log("setupRadioInterfaceCapabilities: "
                             + "mRadioInterfaceCapabilities now setup");
                     mRadioInterfaceCapabilities =