commit 370f9c1ecdf1d48360a625c31439dc449b350670
author yueg <yueg@google.com> Mon Jun 25 16:27:06 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue Jun 26 13:45:19 2018 -0700
tree 8adf42ea8bfb816df547139bd53ca139f3ba0571
parent 3549493fcf01ea4926666d6ceeb85e35271345e2

Don't show mock location for emergency call

Test: manual
PiperOrigin-RevId: 202040098
Change-Id: Id9a6c59d343634473fc2f695d6eafefd16b3c1b7

java/com/android/incallui/calllocation/impl/LocationHelper.java

diff --git a/java/com/android/incallui/calllocation/impl/LocationHelper.java b/java/com/android/incallui/calllocation/impl/LocationHelper.java
index 7fbd60d..5c105e4 100644
--- a/java/com/android/incallui/calllocation/impl/LocationHelper.java
+++ b/java/com/android/incallui/calllocation/impl/LocationHelper.java
@@ -49,6 +49,7 @@
   public static final int LOCATION_STATUS_STALE = 2;
   public static final int LOCATION_STATUS_INACCURATE = 3;
   public static final int LOCATION_STATUS_NO_LOCATION = 4;
+  public static final int LOCATION_STATUS_MOCK = 5;
 
   /** Possible return values for {@code checkLocation()} */
   @IntDef({
@@ -56,7 +57,8 @@
     LOCATION_STATUS_OK,
     LOCATION_STATUS_STALE,
     LOCATION_STATUS_INACCURATE,
-    LOCATION_STATUS_NO_LOCATION
+    LOCATION_STATUS_NO_LOCATION,
+    LOCATION_STATUS_MOCK
   })
   @Retention(RetentionPolicy.SOURCE)
   public @interface LocationStatus {}
@@ -118,6 +120,11 @@
       return LOCATION_STATUS_INACCURATE;
     }
 
+    if (location.isFromMockProvider()) {
+      LogUtil.i("LocationHelper.checkLocation", "from mock provider");
+      return LOCATION_STATUS_MOCK;
+    }
+
     return LOCATION_STATUS_OK;
   }