| commit | 2532881f52bdac588dd1dbb02e69f2ce28fc5799 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Wed Sep 10 21:47:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 10 21:47:00 2014 +0000 |
| tree | d64b3fbc5eb128b579d5a8d0547987da183c5eae | |
| parent | 9830962083f6dea024fb65b2c43a60e6645b804a [diff] | |
| parent | 66c0d0cb8c606c289d34e18a09abc1f28beb77ce [diff] |
am 1f35a9b6: Merge "QS: Fix NPE path inside cell tile." into lmp-dev * commit '1f35a9b62db9cb420dd69676f1c4b7c18b6f01ba': QS: Fix NPE path inside cell tile.
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 @@ @Override public DataUsageInfo getDataUsageInfo() { final DataUsageInfo info = mMobileDataController.getDataUsageInfo(); - info.carrier = mNetworkName; + if (info != null) { + info.carrier = mNetworkName; + } return info; }