commit f3d0f8ccf2dd7edd62b4f5e8e70d3b68075eb8d3
author Jack Yu <jackyu@google.com> Wed Jan 29 01:10:18 2020 -0800
committer Jack Yu <jackyu@google.com> Tue Feb 04 20:30:26 2020 -0800
tree e3d03889922e9f60fc090bd1fae9c3868d643ae8
parent 87db6b74baf07d69c7210f081c3e192571ce3485

Used the correct CbGeoUtils class

Circle and Polygon should come from platform.

Bug: 148545623
Test: Manual
Merged-In: I97378b70dc1ec541f3552b00b46473b2b2730670
Change-Id: I97378b70dc1ec541f3552b00b46473b2b2730670
(cherry picked from commit c8a7a07e25e740fc185d500a4ee4f7953e2c866c)

src/com/android/cellbroadcastservice/GsmSmsCbMessage.java

diff --git a/src/com/android/cellbroadcastservice/GsmSmsCbMessage.java b/src/com/android/cellbroadcastservice/GsmSmsCbMessage.java
index cb5c305..b4e8f89 100644
--- a/src/com/android/cellbroadcastservice/GsmSmsCbMessage.java
+++ b/src/com/android/cellbroadcastservice/GsmSmsCbMessage.java
@@ -25,8 +25,10 @@
 import android.annotation.NonNull;
 import android.content.Context;
 import android.content.res.Resources;
+import android.telephony.CbGeoUtils.Circle;
 import android.telephony.CbGeoUtils.Geometry;
 import android.telephony.CbGeoUtils.LatLng;
+import android.telephony.CbGeoUtils.Polygon;
 import android.telephony.SmsCbLocation;
 import android.telephony.SmsCbMessage;
 import android.telephony.SmsMessage;
@@ -34,8 +36,6 @@
 import android.util.Log;
 import android.util.Pair;
 
-import com.android.cellbroadcastservice.CbGeoUtils.Circle;
-import com.android.cellbroadcastservice.CbGeoUtils.Polygon;
 import com.android.cellbroadcastservice.GsmSmsCbMessage.GeoFencingTriggerMessage.CellBroadcastIdentity;
 import com.android.cellbroadcastservice.SmsCbHeader.DataCodingScheme;
 import com.android.internal.annotations.VisibleForTesting;

tests/src/com/android/cellbroadcastservice/tests/GsmSmsCbMessageTest.java

diff --git a/tests/src/com/android/cellbroadcastservice/tests/GsmSmsCbMessageTest.java b/tests/src/com/android/cellbroadcastservice/tests/GsmSmsCbMessageTest.java
index 73820b6..e1c9308 100644
--- a/tests/src/com/android/cellbroadcastservice/tests/GsmSmsCbMessageTest.java
+++ b/tests/src/com/android/cellbroadcastservice/tests/GsmSmsCbMessageTest.java
@@ -17,6 +17,8 @@
 package com.android.cellbroadcastservice.tests;
 
 import android.telephony.CbGeoUtils;
+import android.telephony.CbGeoUtils.Circle;
+import android.telephony.CbGeoUtils.Polygon;
 import android.telephony.SmsCbCmasInfo;
 import android.telephony.SmsCbEtwsInfo;
 import android.telephony.SmsCbLocation;
@@ -27,8 +29,6 @@
 
 import androidx.test.InstrumentationRegistry;
 
-import com.android.cellbroadcastservice.CbGeoUtils.Circle;
-import com.android.cellbroadcastservice.CbGeoUtils.Polygon;
 import com.android.cellbroadcastservice.GsmSmsCbMessage;
 import com.android.cellbroadcastservice.R;
 import com.android.cellbroadcastservice.SmsCbConstants;