| commit | 9ee9aa050d6e74dde0f729857fb35032b0045722 | [log] [tgz] |
|---|---|---|
| author | Kathan Shukla <kathan@google.com> | Thu Dec 05 06:06:46 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 05 06:06:46 2019 +0000 |
| tree | 59f427100a57f9072393eaf26e4043b1877bdf7f | |
| parent | 2cee5c316ebb6cc2e4d48acbeac435a2d8bd09bd [diff] | |
| parent | 88d63ccbd75f63645161762eca30688fd9c70cc3 [diff] |
Merge "Fix spelling of presence in Occupant Awareness."
diff --git a/automotive/occupant_awareness/aidl/android/hardware/automotive/occupant_awareness/IOccupantAwareness.aidl b/automotive/occupant_awareness/aidl/android/hardware/automotive/occupant_awareness/IOccupantAwareness.aidl index 86d9e2f..1df0bda 100644 --- a/automotive/occupant_awareness/aidl/android/hardware/automotive/occupant_awareness/IOccupantAwareness.aidl +++ b/automotive/occupant_awareness/aidl/android/hardware/automotive/occupant_awareness/IOccupantAwareness.aidl
@@ -30,7 +30,7 @@ /* * System is able to detect the presence of humans. */ - const int CAP_PRESENSE_DETECTION = 1 << 0; + const int CAP_PRESENCE_DETECTION = 1 << 0; /* * System is able to detect the gaze of humans. */
diff --git a/automotive/occupant_awareness/aidl/default/OccupantAwareness.cpp b/automotive/occupant_awareness/aidl/default/OccupantAwareness.cpp index ef5055f..a156075 100644 --- a/automotive/occupant_awareness/aidl/default/OccupantAwareness.cpp +++ b/automotive/occupant_awareness/aidl/default/OccupantAwareness.cpp
@@ -25,7 +25,7 @@ using ndk::ScopedAStatus; -static const int32_t kAllCapabilities = OccupantAwareness::CAP_PRESENSE_DETECTION | +static const int32_t kAllCapabilities = OccupantAwareness::CAP_PRESENCE_DETECTION | OccupantAwareness::CAP_GAZE_DETECTION | OccupantAwareness::CAP_DRIVER_MONITORING_DETECTION;