From 1a0f1591decb24a240a551546f276264bb39fa99 Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Tue, 28 Apr 2020 15:30:18 +0900 Subject: [PATCH] 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 Change-Id: I9e0049dd61713f7a9638fb19a37aaa261f35d768 --- .../ui/appsettings/PerSubscriptionSettingsActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 @@ public class PerSubscriptionSettingsActivity extends BugleActionBarActivity { autoRetrieveMmsPreference.setEnabled(false); final Preference deliveryReportsPreference = findPreference(getString(R.string.delivery_reports_pref_key)); - deliveryReportsPreference.setEnabled(false); + if (deliveryReportsPreference != null) { + deliveryReportsPreference.setEnabled(false); + } } }