commit 95602e325ae1ee9cf383db38cb0a8d47567618dc
author Yu-Han Yang <yuhany@google.com> Fri Jan 15 14:24:09 2021 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Tue Feb 09 01:23:08 2021 +0000
tree d3fe47046cd4091bba78e62bccd6728cc9f10c1c
parent 260e747d200c7b984b16bcfeca992cb3b478276f

DO NOT MERGE: Do not inject mock location to chipset

Bug: 177561690
Test: on device
Change-Id: Icafbdf54fe807f8779377b13cb4e4eb265db692e
(cherry picked from commit abccd8f7bc76e19e92d2dfebe2247e97619f7234)

services/core/java/com/android/server/location/gnss/GnssLocationProvider.java

diff --git a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
index a6a607e..8d1d3af 100644
--- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
@@ -841,6 +841,9 @@
     }
 
     private void injectBestLocation(Location location) {
+        if (location.isFromMockProvider()) {
+            return;
+        }
         if (DEBUG) {
             Log.d(TAG, "injectBestLocation: " + location);
         }
@@ -942,6 +945,9 @@
     }
 
     private void injectLocation(Location location) {
+        if (location.isFromMockProvider()) {
+            return;
+        }
         if (location.hasAccuracy()) {
             if (DEBUG) {
                 Log.d(TAG, "injectLocation: " + location);