Merge "Wifi: Add 6GHz bands to WifiBand"
diff --git a/audio/effect/all-versions/default/Effect.cpp b/audio/effect/all-versions/default/Effect.cpp
index e11e123..406a571 100644
--- a/audio/effect/all-versions/default/Effect.cpp
+++ b/audio/effect/all-versions/default/Effect.cpp
@@ -709,7 +709,10 @@
#elif MAJOR_VERSION >= 6
// No need to join the processing thread, it is part of the API contract that the client
// must finish processing before closing the effect.
- return analyzeStatus("EffectRelease", "", sContextCallFunction, EffectRelease(mHandle));
+ Result retval =
+ analyzeStatus("EffectRelease", "", sContextCallFunction, EffectRelease(mHandle));
+ EffectMap::getInstance().remove(mHandle);
+ return retval;
#endif
}
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;