commit 9190189ed9d8f2ab444163030a38386d06b35854
author James.cf Lin <jamescflin@google.com> Thu May 28 10:02:43 2020 +0800
committer James.cf Lin <jamescflin@google.com> Fri May 29 01:11:35 2020 +0800
tree 6732ee01d9d64d499f5d3ce6737d353ad31f7184
parent 365e41d384cd61fb21ff98b8c7707b6bb1e3c327

Fix NullPointerException in PresencePublication

UserCapabilityExchangeImpl may pass the null object into the PresencePublication.
Do not call the PresencePublication#onFeatureCapabilityChanged api.

Bug: 157531336
Test: manual
Change-Id: Ib971fbf97f93d51ac43815d2354d09b572894aa2

src/com/android/services/telephony/rcs/UserCapabilityExchangeImpl.java

diff --git a/src/com/android/services/telephony/rcs/UserCapabilityExchangeImpl.java b/src/com/android/services/telephony/rcs/UserCapabilityExchangeImpl.java
index 0c91c55..ee0c5be 100644
--- a/src/com/android/services/telephony/rcs/UserCapabilityExchangeImpl.java
+++ b/src/com/android/services/telephony/rcs/UserCapabilityExchangeImpl.java
@@ -938,7 +938,11 @@
             synchronized (mCapabilitiesLock) {
                 capabilities = mMmTelCapabilities;
             }
-            mPresencePublication.onFeatureCapabilityChanged(mNetworkRegistrationType, capabilities);
+
+            if (capabilities != null) {
+                mPresencePublication.onFeatureCapabilityChanged(mNetworkRegistrationType,
+                        capabilities);
+            }
         }
 
         @Override
@@ -951,7 +955,11 @@
             synchronized (mCapabilitiesLock) {
                 capabilities = mMmTelCapabilities;
             }
-            mPresencePublication.onFeatureCapabilityChanged(mNetworkRegistrationType, capabilities);
+
+            if (capabilities != null) {
+                mPresencePublication.onFeatureCapabilityChanged(mNetworkRegistrationType,
+                        capabilities);
+            }
             mPresencePublication.onImsDisconnected();
         }
     };
@@ -960,6 +968,10 @@
             new ImsMmTelManager.CapabilityCallback() {
         @Override
         public void onCapabilitiesStatusChanged(MmTelFeature.MmTelCapabilities capabilities) {
+            if (capabilities == null) {
+                logw("onCapabilitiesStatusChanged: parameter is null");
+                return;
+            }
             synchronized (mCapabilitiesLock) {
                 mMmTelCapabilities = capabilities;
             }