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

Commit 3d7336bc authored by Enxun Wei's avatar Enxun Wei Committed by Android (Google) Code Review
Browse files

Merge "Add a flag to disable HardwareActivityRecognitionProxy" into main

parents 068427d1 8a92fd71

location/java/android/location/flags/location.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -175,3 +175,10 @@ flag { 
    description: "Support TOA in GnssSatelliteAlmanac"

    bug: "409934786"

}



flag {

    name: "disable_hardware_ar"

    namespace: "location"

    description: "Disables the legacy hardware AR code path which has been deprecated for a long time"

    bug: "441145460"

}

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

+7 −5
Original line number Diff line number Diff line
@@ -553,12 +553,14 @@ public class LocationManagerService extends ILocationManager.Stub implements 
            setLocationFudgerCache(new LocationFudgerCache(mPopulationDensityProvider));

        }



        if (!Flags.disableHardwareAr()) {

            // bind to hardware activity recognition

            HardwareActivityRecognitionProxy hardwareActivityRecognitionProxy =

                    HardwareActivityRecognitionProxy.createAndRegister(mContext);

            if (hardwareActivityRecognitionProxy == null) {

                Log.e(TAG, "unable to bind ActivityRecognitionProxy");

            }

        }



        // bind to gnss geofence proxy

        if (mGnssManagerService != null) {