summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-10-08 22:48:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-08 22:48:44 +0000
commit529b78941c20c2b45312eeedbd509d0ded4f7323 (patch)
tree1aff9a9aac271e48dec04cb986c5cadc5f4105e9 /core/java/android/hardware
parent511925c9e143ebc6eeb0efdf433cc0519b5e5eb1 (diff)
parent89b196958fee07475765bd3c458098464ba16f2e (diff)
downloadframeworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.zip
frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.tar.gz
frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.tar.bz2
am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '89b196958fee07475765bd3c458098464ba16f2e': Put in real "code" (aka marketing) name.
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/location/GeofenceHardware.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/location/GeofenceHardware.java b/core/java/android/hardware/location/GeofenceHardware.java
index 7dd105a..f537a77 100644
--- a/core/java/android/hardware/location/GeofenceHardware.java
+++ b/core/java/android/hardware/location/GeofenceHardware.java
@@ -490,7 +490,7 @@ public final class GeofenceHardware {
// and only call the updated callback on on L and above, this complies with the
// documentation of GeofenceHardwareMonitorCallback
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.L) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
c.onMonitoringSystemChange(event);
}
}