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

Commit 0ad7b9bc authored by David Christie's avatar David Christie Committed by Android Git Automerger
Browse files

am 12b49884: am f02c7d43: Merge "Fix issue where GeofenceHardwareImpl can... 

am 12b49884: am f02c7d43: Merge "Fix issue where GeofenceHardwareImpl can crash. -It can\'t be instantiated before looper thread  is ready. Bug: 21185178" into mnc-dev

* commit '12b49884':
  Fix issue where GeofenceHardwareImpl can crash. -It can't be instantiated before looper thread  is ready. Bug: 21185178
parents 506c96a1 12b49884

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

+5 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class FlpHardwareProvider { 
    // Capabilities provided by FlpCallbacks

    private boolean mHaveBatchingCapabilities;

    private int mBatchingCapabilities;

    private int mVersion;

    private int mVersion = 1;



    private static FlpHardwareProvider sSingletonInstance = null;
@@ -154,7 +154,9 @@ public class FlpHardwareProvider { 


    private void setVersion(int version) {

        mVersion = version;

        getGeofenceHardwareSink().setVersion(version);

        if (mGeofenceHardwareSink != null) {

            mGeofenceHardwareSink.setVersion(version);

        }

    }



    private void maybeSendCapabilities() {
@@ -480,6 +482,7 @@ public class FlpHardwareProvider { 
    private GeofenceHardwareImpl getGeofenceHardwareSink() {

        if (mGeofenceHardwareSink == null) {

            mGeofenceHardwareSink = GeofenceHardwareImpl.getInstance(mContext);

            mGeofenceHardwareSink.setVersion(mVersion);

        }



        return mGeofenceHardwareSink;