Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe3b440d authored by David Christie's avatar David Christie Committed by Automerger Merge Worker
Browse files

Merge "Fix issue where location_hardware_provider is delivered through the... 

Merge "Fix issue where location_hardware_provider is delivered through the passive provider" into udc-qpr-dev am: 262dc8d7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25154456



Change-Id: I4e3562f3394d9bdd85debd8e7186a23ef4660918
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 822ae751 262dc8d7

services/core/java/com/android/server/location/LocationManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -467,13 +467,14 @@ public class LocationManagerService extends ILocationManager.Stub implements 
                // If we have a GNSS provider override, add the hardware provider as a standalone

                // option for use by apps with the correct permission. Note the GNSS HAL can only

                // support a single client, so mGnssManagerService.getGnssLocationProvider() can

                // only be installed with a single provider.

                // only be installed with a single provider. Locations from this provider won't

                // be reported through the passive provider.

                LocationProviderManager gnssHardwareManager =

                        new LocationProviderManager(

                                mContext,

                                mInjector,

                                GPS_HARDWARE_PROVIDER,

                                mPassiveManager,

                                /*passiveManager=*/ null,

                                Collections.singletonList(Manifest.permission.LOCATION_HARDWARE));

                addLocationProviderManager(

                        gnssHardwareManager, mGnssManagerService.getGnssLocationProvider());