commit 1a0f1591decb24a240a551546f276264bb39fa99
author Taesu Lee <taesu82.lee@samsung.com> Tue Apr 28 15:30:18 2020 +0900
committer Taesu Lee <taesu82.lee@samsung.com> Tue Apr 28 17:28:42 2020 +0900
tree 04f125932b05d22ff61c2dca452f10f72d063d85
parent 7ccb748e61a1c912e17f92a392b930368ceb736a

Fix NPE

Check whether SMS delivery report preference is available first because
it could be removed if carriers don't support it.

Test: Manual

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I9e0049dd61713f7a9638fb19a37aaa261f35d768

src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java

diff --git a/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java b/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java
index 7ab5dc7..9ad90d8 100644
--- a/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java
+++ b/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java
@@ -183,7 +183,9 @@
                 autoRetrieveMmsPreference.setEnabled(false);
                 final Preference deliveryReportsPreference =
                         findPreference(getString(R.string.delivery_reports_pref_key));
-                deliveryReportsPreference.setEnabled(false);
+                if (deliveryReportsPreference != null) {
+                    deliveryReportsPreference.setEnabled(false);
+                }
             }
         }