commit d9eb7da8777390662732098edae8930fda567953
author Robert Greenwalt <rgreenwalt@google.com> Wed Aug 19 12:18:12 2015 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Wed Aug 19 12:18:12 2015 -0700
tree 31c5c6a08d1bfc011e7f78c7c3ee88772f7b5a00
parent 1cb10b8321bf4e6ac8ea681315351a8b66118327

Fix getAllCellInfo to handle null.

Phone.getAllCellInfo may return null, but List.addAll doesn't like that.

bug:23201508
Change-Id: Ic8b8c742e07712ea78c8fe4482a6aeaae267d8d5

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 93d369c..ebfab96 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 {