diff options
| author | Daniel Estrada Alva <destradaa@google.com> | 2015-08-26 21:09:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-26 21:09:50 +0000 |
| commit | 47ee2ecf82958f211c775a4125968fbf505fe594 (patch) | |
| tree | a7a5d04be063304d9f34bef4d17240fd7c306bab /location | |
| parent | b9b57225c28cdec5a8b7c2a6353f40a66010c0ed (diff) | |
| parent | 614612edb508dd5ef1a8f463105b16894906264e (diff) | |
| download | frameworks_base-47ee2ecf82958f211c775a4125968fbf505fe594.zip frameworks_base-47ee2ecf82958f211c775a4125968fbf505fe594.tar.gz frameworks_base-47ee2ecf82958f211c775a4125968fbf505fe594.tar.bz2 | |
Merge "Disable AR HW when client binder dies." into mnc-dr-dev
Diffstat (limited to 'location')
| -rw-r--r-- | location/lib/java/com/android/location/provider/ActivityRecognitionProvider.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/location/lib/java/com/android/location/provider/ActivityRecognitionProvider.java b/location/lib/java/com/android/location/provider/ActivityRecognitionProvider.java index f4943d5..bc2dae1 100644 --- a/location/lib/java/com/android/location/provider/ActivityRecognitionProvider.java +++ b/location/lib/java/com/android/location/provider/ActivityRecognitionProvider.java @@ -42,6 +42,8 @@ public final class ActivityRecognitionProvider { public static final String ACTIVITY_STILL = "android.activity_recognition.still"; public static final String ACTIVITY_TILTING = "android.activity_recognition.tilting"; + // NOTE: when adding an additional EVENT_TYPE_, EVENT_TYPE_COUNT needs to be updated in + // android.hardware.location.ActivityRecognitionHardware public static final int EVENT_TYPE_FLUSH_COMPLETE = 0; public static final int EVENT_TYPE_ENTER = 1; public static final int EVENT_TYPE_EXIT = 2; |