diff options
| author | Michael W <baddaemon87@gmail.com> | 2016-09-17 14:25:16 +0200 |
|---|---|---|
| committer | Michael W <baddaemon87@gmail.com> | 2016-09-17 14:25:16 +0200 |
| commit | bb884965ef65fd54e069d1319a67b06bf9485194 (patch) | |
| tree | 51482ceff986106881e8c810b7f488f19cec93e9 | |
| parent | 2473a6ade3729999210bef9275c17c6287c7b3f3 (diff) | |
| download | android_packages_providers_DataUsageProvider-bb884965ef65fd54e069d1319a67b06bf9485194.tar.gz android_packages_providers_DataUsageProvider-bb884965ef65fd54e069d1319a67b06bf9485194.tar.bz2 android_packages_providers_DataUsageProvider-bb884965ef65fd54e069d1319a67b06bf9485194.zip | |
DataUsageProvider: Fix possible NPE
getText returns null if the text can't be determined,
causing a NPE when calling toString()
Fix this by checking for null first
Change-Id: Ib96b167c7f579a816b67c92a26ddbafda2cbf386
Reference: BugDumps 20160909-15 L#25
| -rw-r--r-- | src/org/cyanogenmod/providers/datausage/UidDetailProvider.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/org/cyanogenmod/providers/datausage/UidDetailProvider.java b/src/org/cyanogenmod/providers/datausage/UidDetailProvider.java index 0b93788..ad215d9 100644 --- a/src/org/cyanogenmod/providers/datausage/UidDetailProvider.java +++ b/src/org/cyanogenmod/providers/datausage/UidDetailProvider.java @@ -154,8 +154,11 @@ public class UidDetailProvider { if (appInfo != null) { if (packageInfo.sharedUserLabel != 0) { - detail.label = pm.getText(packageName, packageInfo.sharedUserLabel, - packageInfo.applicationInfo).toString(); + CharSequence label = pm.getText(packageName, + packageInfo.sharedUserLabel, packageInfo.applicationInfo); + if (label != null) { + detail.label = label.toString(); + } } } } |