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

Commit 28997e03 authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

Merge "Corrects broadcast area for geo-fencing trigger message" into qt-qpr1-dev 

am: c599233e

Change-Id: I79ee852dd4362082c3077cf81bc261ec325ff598
parents e856b147 c599233e

src/java/com/android/internal/telephony/gsm/GsmCellBroadcastHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public class GsmCellBroadcastHandler extends CellBroadcastHandler { 
                broadcastMessage(cbMessages, cbMessageUris);

            } else {

                for (int i = 0; i < cbMessages.size(); i++) {

                    List<Geometry> broadcastArea = commonBroadcastArea.isEmpty()

                    List<Geometry> broadcastArea = !commonBroadcastArea.isEmpty()

                            ? commonBroadcastArea : cbMessages.get(i).getGeometries();

                    if (broadcastArea == null || broadcastArea.isEmpty()) {

                        broadcastMessage(cbMessages.get(i), cbMessageUris.get(i));