49 lines
2.2 KiB
Diff
49 lines
2.2 KiB
Diff
|
From: thermatk <thermatk@thermatk.com>
|
||
|
|
Date: Fri, 22 Jun 2018 17:05:17 +0200
|
||
|
|
Subject: kill Location, fall back to system
|
||
|
|
|
||
|
|
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||
|
|
---
|
||
|
|
services/device/geolocation/BUILD.gn | 1 -
|
||
|
|
.../device/geolocation/LocationProviderFactory.java | 10 ++--------
|
||
|
|
2 files changed, 2 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
|
||
|
|
--- a/services/device/geolocation/BUILD.gn
|
||
|
|
+++ b/services/device/geolocation/BUILD.gn
|
||
|
|
@@ -163,7 +163,6 @@ if (is_android) {
|
||
|
|
"android/java/src/org/chromium/device/geolocation/LocationProviderAdapter.java",
|
||
|
|
"android/java/src/org/chromium/device/geolocation/LocationProviderAndroid.java",
|
||
|
|
"android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java",
|
||
|
|
- "android/java/src/org/chromium/device/geolocation/LocationProviderGmsCore.java",
|
||
|
|
]
|
||
|
|
|
||
|
|
deps = [
|
||
|
|
diff --git a/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java b/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java
|
||
|
|
--- a/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java
|
||
|
|
+++ b/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java
|
||
|
|
@@ -27,19 +27,13 @@ public class LocationProviderFactory {
|
||
|
|
|
||
|
|
@CalledByNative
|
||
|
|
public static void useGmsCoreLocationProvider() {
|
||
|
|
- sUseGmsCoreLocationProvider = true;
|
||
|
|
+ sUseGmsCoreLocationProvider = false;
|
||
|
|
}
|
||
|
|
|
||
|
|
public static LocationProvider create() {
|
||
|
|
if (sProviderImpl != null) return sProviderImpl;
|
||
|
|
|
||
|
|
- if (sUseGmsCoreLocationProvider
|
||
|
|
- && LocationProviderGmsCore.isGooglePlayServicesAvailable(
|
||
|
|
- ContextUtils.getApplicationContext())) {
|
||
|
|
- sProviderImpl = new LocationProviderGmsCore(ContextUtils.getApplicationContext());
|
||
|
|
- } else {
|
||
|
|
- sProviderImpl = new LocationProviderAndroid();
|
||
|
|
- }
|
||
|
|
+ sProviderImpl = new LocationProviderAndroid();
|
||
|
|
return sProviderImpl;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.25.1
|