summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-09-10 17:34:56 -0400
committerJohn Spurlock <jspurlock@google.com>2014-09-10 17:34:56 -0400
commitf7f00ea9d3b648bd3491091188bc7a3615ae4aff (patch)
tree5a656e2454cda65d20231eea1dfa4461831c3652
parent6658b159dbb4892a6429891f2ae9eccef3b59ccf (diff)
downloadframeworks_base-f7f00ea9d3b648bd3491091188bc7a3615ae4aff.zip
frameworks_base-f7f00ea9d3b648bd3491091188bc7a3615ae4aff.tar.gz
frameworks_base-f7f00ea9d3b648bd3491091188bc7a3615ae4aff.tar.bz2
QS: Fix NPE path inside cell tile.
Bug:17456632 Change-Id: Ifc859cf8c1620152fd333d3a92bcd1a47ac1d7e7
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
index 5088089..4d248c2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
@@ -337,7 +337,9 @@ public class NetworkControllerImpl extends BroadcastReceiver
@Override
public DataUsageInfo getDataUsageInfo() {
final DataUsageInfo info = mMobileDataController.getDataUsageInfo();
- info.carrier = mNetworkName;
+ if (info != null) {
+ info.carrier = mNetworkName;
+ }
return info;
}