diff options
| author | John Spurlock <jspurlock@google.com> | 2014-09-10 21:40:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-10 21:40:43 +0000 |
| commit | 66c0d0cb8c606c289d34e18a09abc1f28beb77ce (patch) | |
| tree | 3a82c0c9e5141343af27dbcbb22aeeca50870319 | |
| parent | ebcd9189e3ec3cc7321883b4a2ca1c76da52eff7 (diff) | |
| parent | f7f00ea9d3b648bd3491091188bc7a3615ae4aff (diff) | |
| download | frameworks_base-66c0d0cb8c606c289d34e18a09abc1f28beb77ce.zip frameworks_base-66c0d0cb8c606c289d34e18a09abc1f28beb77ce.tar.gz frameworks_base-66c0d0cb8c606c289d34e18a09abc1f28beb77ce.tar.bz2 | |
Merge "QS: Fix NPE path inside cell tile." into lmp-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java | 4 |
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; } |