From 0c7e103fd7c8d50322057a1f0fe852de9df0a029 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Mon, 20 May 2019 23:45:56 +0200 Subject: [PATCH 3/3] Fail gracefully in mobile settings --- src/com/android/phone/DataUsagePreference.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/phone/DataUsagePreference.java b/src/com/android/phone/DataUsagePreference.java index b6b26e2b8..ebd446dfa 100644 --- a/src/com/android/phone/DataUsagePreference.java +++ b/src/com/android/phone/DataUsagePreference.java @@ -54,8 +54,12 @@ public class DataUsagePreference extends Preference { DataUsageController controller = new DataUsageController(activity); DataUsageController.DataUsageInfo usageInfo = controller.getDataUsageInfo(mTemplate); - setSummary(activity.getString(R.string.data_usage_template, - Formatter.formatFileSize(activity, usageInfo.usageLevel), usageInfo.period)); + if(usageInfo != null) { + setSummary(activity.getString(R.string.data_usage_template, + Formatter.formatFileSize(activity, usageInfo.usageLevel), usageInfo.period)); + } else { + setSummary(activity.getString(R.string.data_usage_title)); + } setIntent(getIntent()); } -- 2.17.1