diff options
author | Kai <kwangsudo@google.com> | 2018-06-20 12:37:52 -0700 |
---|---|---|
committer | Kai Wang <kwangsudo@google.com> | 2018-06-29 20:01:20 +0000 |
commit | a67a9ab80906c3e6767066dab607ce98788053ea (patch) | |
tree | af095f2fb8752c7d9e03fd73c4a3764b25fba2c7 /car-lib | |
parent | 1ab32b66ef7467e536df727b0b9419dd31556a8e (diff) | |
download | Car-a67a9ab80906c3e6767066dab607ce98788053ea.tar.gz |
Fix setting night mode and change test crashes EKS
Add AsyncTask to refresh Car*Manager. Ensure all properties will
be checked when we use unregister a listener.
Bug: 110043754, 110437786
Test: 1) Start EKS, Select "Sensors" test.
2) Use vhal_emulator.py to set night model state to 1.
3) Switch to "hvac" test, set nigth model state to 0.
Change-Id: I48ce210c45cf2da2db90178aa909e5f10eada8f6
Merged-In: I48ce210c45cf2da2db90178aa909e5f10eada8f6
(cherry picked from commit cf3387bd4c90ee09eeff2dc0878c26a399e5ff23)
Diffstat (limited to 'car-lib')
-rw-r--r-- | car-lib/src/android/car/hardware/property/CarPropertyManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/car-lib/src/android/car/hardware/property/CarPropertyManager.java b/car-lib/src/android/car/hardware/property/CarPropertyManager.java index ff8c4db3c7..373c23a726 100644 --- a/car-lib/src/android/car/hardware/property/CarPropertyManager.java +++ b/car-lib/src/android/car/hardware/property/CarPropertyManager.java @@ -178,8 +178,12 @@ public class CarPropertyManager implements CarManagerBase { */ public void unregisterListener(CarPropertyEventListener listener) { synchronized (mActivePropertyListener) { + int [] propertyIds = new int[mActivePropertyListener.size()]; for (int i = 0; i < mActivePropertyListener.size(); i++) { - doUnregisterListenerLocked(listener, mActivePropertyListener.keyAt(i)); + propertyIds[i] = mActivePropertyListener.keyAt(i); + } + for (int prop : propertyIds) { + doUnregisterListenerLocked(listener, prop); } } } |