From abccd8f7bc76e19e92d2dfebe2247e97619f7234 Mon Sep 17 00:00:00 2001 From: Yu-Han Yang Date: Fri, 15 Jan 2021 14:24:09 -0800 Subject: DO NOT MERGE: Do not inject mock location to chipset Bug: 177561690 Test: on device Change-Id: Icafbdf54fe807f8779377b13cb4e4eb265db692e --- .../java/com/android/server/location/gnss/GnssLocationProvider.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 a6a607e4ce66..8d1d3afab5c5 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); -- cgit v1.2.3-59-g8ed1b