Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev

2021-01-21 21:27:12 +00:00
parent 572c7f769c abccd8f7bc
commit 94b4830cb8
1 changed files with 6 additions and 0 deletions
--- 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);