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

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

Browse Source
This commit is contained in:
David Christie
2015-05-15 20:50:54 +00:00
committed by Android (Google) Code Review
parent 4f9fd626d3 38feb6f1ec
commit f02c7d4391
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/location/FlpHardwareProvider.java
View File

@@ -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;