From 017cc4e48f68b374d1533a9c55026918d18b6d4c Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Mon, 4 May 2020 14:09:46 +0800 Subject: [PATCH] [Settings] Crash avoidance Avoid crash when NullPointer. Bug: 155248992 Test: manual Change-Id: I5e4b46dcdf7ff21713b3f77fc9e20f503800b8e2 --- .../settings/network/telephony/MobileNetworkSettings.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index 54fe2c16eef..0f76203d2ae 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -133,7 +133,11 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment { public void onAttach(Context context) { super.onAttach(context); - use(DataUsageSummaryPreferenceController.class).init(mSubId); + final DataUsageSummaryPreferenceController dataUsageSummaryPreferenceController = + use(DataUsageSummaryPreferenceController.class); + if (dataUsageSummaryPreferenceController != null) { + dataUsageSummaryPreferenceController.init(mSubId); + } use(CallsDefaultSubscriptionController.class).init(getLifecycle()); use(SmsDefaultSubscriptionController.class).init(getLifecycle()); use(MobileNetworkSwitchController.class).init(getLifecycle(), mSubId);