summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorZhentao Sun <robinvane@google.com>2013-05-14 16:55:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-14 16:55:44 -0700
commitda861962875287bec87c802e766d6c018e7c5352 (patch)
treebb90163d248d76e2ab9f324d14d6a614df524194 /core/java/android/hardware
parent2d704d215fcd2b065bfce01da7f008a2bfaa0adc (diff)
parent0412f5b1165d7ff331162dcd1fc29d3ea0fc7223 (diff)
downloadframeworks_base-da861962875287bec87c802e766d6c018e7c5352.zip
frameworks_base-da861962875287bec87c802e766d6c018e7c5352.tar.gz
frameworks_base-da861962875287bec87c802e766d6c018e7c5352.tar.bz2
am 0412f5b1: am 5f8afdd8: Merge "Passed the correct gps geofence availability value to client." into jb-mr2-dev
* commit '0412f5b1165d7ff331162dcd1fc29d3ea0fc7223': Passed the correct gps geofence availability value to client.
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/location/GeofenceHardwareImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/location/GeofenceHardwareImpl.java b/core/java/android/hardware/location/GeofenceHardwareImpl.java
index 9823c49..77e3143 100644
--- a/core/java/android/hardware/location/GeofenceHardwareImpl.java
+++ b/core/java/android/hardware/location/GeofenceHardwareImpl.java
@@ -399,8 +399,8 @@ public final class GeofenceHardwareImpl {
boolean available = false;
if (status == GeofenceHardware.GPS_GEOFENCE_AVAILABLE) available = true;
- int val = (available ? GeofenceHardware.MONITOR_CURRENTLY_UNAVAILABLE :
- GeofenceHardware.MONITOR_CURRENTLY_AVAILABLE);
+ int val = (available ? GeofenceHardware.MONITOR_CURRENTLY_AVAILABLE :
+ GeofenceHardware.MONITOR_CURRENTLY_UNAVAILABLE);
setMonitorAvailability(GeofenceHardware.MONITORING_TYPE_GPS_HARDWARE, val);
acquireWakeLock();