Merge changes from topic "am-9f1f3a1f2cf946f0b2fe74dbf8e9b4d1" into rvc-qpr-dev-plus-aosp

* changes:
  Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: 94b4830cb8
  DO NOT MERGE: Do not inject mock location to chipset am: abccd8f7bc

1 files changed, 6 insertions, 0 deletions

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 5bd3c5707fd2..8017a442d8e7 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 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
     }
 
     private void injectBestLocation(Location location) {
+        if (location.isFromMockProvider()) {
+            return;
+        }
         if (DEBUG) {
             Log.d(TAG, "injectBestLocation: " + location);
         }
@@ -942,6 +945,9 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
     }
 
     private void injectLocation(Location location) {
+        if (location.isFromMockProvider()) {
+            return;
+        }
         if (location.hasAccuracy()) {
             if (DEBUG) {
                 Log.d(TAG, "injectLocation: " + location);