Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Automerger Merge Worker
2021-01-21 23:08:41 +00:00
committed by Android (Google) Code Review
parent f8e1ebb616 7a606738dc
commit b8349d34c2
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
View File

@@ -841,6 +841,9 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
} }
private void injectBestLocation(Location location) { private void injectBestLocation(Location location) {
if (location.isFromMockProvider()) {
return;
}
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "injectBestLocation: " + location); Log.d(TAG, "injectBestLocation: " + location);
} }
@@ -942,6 +945,9 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
} }
private void injectLocation(Location location) { private void injectLocation(Location location) {
if (location.isFromMockProvider()) {
return;
}
if (location.hasAccuracy()) { if (location.hasAccuracy()) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "injectLocation: " + location); Log.d(TAG, "injectLocation: " + location);