Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 337dc6c4 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 01144882: Fix null handling of getAllCellInfo 

* commit '01144882':
  Fix null handling of getAllCellInfo
parents 979d1669 01144882

src/java/com/android/internal/telephony/PhoneBase.java

+1 −0
Original line number Diff line number Diff line
@@ -1345,6 +1345,7 @@ public abstract class PhoneBase extends Handler implements Phone { 
     * @return the original list with CDMA lat/long cleared if necessary

     */

    private List<CellInfo> privatizeCellInfoList(List<CellInfo> cellInfoList) {

        if (cellInfoList == null) return null;

        int mode = Settings.Secure.getInt(getContext().getContentResolver(),

                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);

        if (mode == Settings.Secure.LOCATION_MODE_OFF) {