commit 924bebf7c4a2a09f0ef27b8f849fbbbab8c939a5
author Robert Greenwalt <rgreenwalt@google.com> Wed Aug 19 21:54:14 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 19 21:54:14 2015 +0000
tree 1f5e5708bda3500d46a707eba623b12ea5946644
parent ec2a795173084dde28f9b78740c37c1e1c0db288
parent d9eb7da8777390662732098edae8930fda567953

am d9eb7da8: Fix getAllCellInfo to handle null.

* commit 'd9eb7da8777390662732098edae8930fda567953':
  Fix getAllCellInfo to handle null.

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8606a3c..7e06fdf 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1517,7 +1517,8 @@
             if (DBG_LOC) log("getAllCellInfo: is active user");
             List<CellInfo> cellInfos = new ArrayList<CellInfo>();
             for (Phone phone : PhoneFactory.getPhones()) {
-                cellInfos.addAll(phone.getAllCellInfo());
+                final List<CellInfo> info = phone.getAllCellInfo();
+                if (info != null) cellInfos.addAll(phone.getAllCellInfo());
             }
             return cellInfos;
         } else {