diff options
| author | Kai Wang <kwangsudo@google.com> | 2018-07-10 17:18:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-10 17:18:13 +0000 |
| commit | bec3d91a12302ecc4d37c49c995a11588bc6cebc (patch) | |
| tree | 33c731409476024e6f631faa695b237db791ea25 /service/src/com/android | |
| parent | bdbf66ece04700137cf989faba7abcb7adf5bd8e (diff) | |
| parent | 46f42a78084a5fe4cf112897ee446b98cb24d89d (diff) | |
| download | Car-bec3d91a12302ecc4d37c49c995a11588bc6cebc.tar.gz | |
Merge "Init DayNightMode after booting" into pi-dev
Diffstat (limited to 'service/src/com/android')
| -rw-r--r-- | service/src/com/android/car/CarNightService.java | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/service/src/com/android/car/CarNightService.java b/service/src/com/android/car/CarNightService.java index e43ed3d8dc..dcf75b55f0 100644 --- a/service/src/com/android/car/CarNightService.java +++ b/service/src/com/android/car/CarNightService.java @@ -72,23 +72,27 @@ public class CarNightService implements CarServiceBase { CarPropertyValue value = event.getCarPropertyValue(); if (value.getPropertyId() == VehicleProperty.NIGHT_MODE) { boolean nightMode = (Boolean) value.getValue(); - if (nightMode) { - mNightSetting = UiModeManager.MODE_NIGHT_YES; - if (DBG) Log.d(CarLog.TAG_SENSOR, "CAR dayNight handleSensorEvent NIGHT"); - } else { - mNightSetting = UiModeManager.MODE_NIGHT_NO; - if (DBG) Log.d(CarLog.TAG_SENSOR, "CAR dayNight handleSensorEvent DAY"); - } - if (mUiModeManager != null && (mForcedMode == FORCED_SENSOR_MODE)) { - mUiModeManager.setNightMode(mNightSetting); - if (DBG) Log.d(CarLog.TAG_SENSOR, "CAR dayNight handleSensorEvent APPLIED"); - } else { - if (DBG) Log.d(CarLog.TAG_SENSOR, "CAR dayNight handleSensorEvent IGNORED"); - } + setNightMode(nightMode); } } } + private synchronized void setNightMode(boolean nightMode) { + if (nightMode) { + mNightSetting = UiModeManager.MODE_NIGHT_YES; + if (DBG) Log.d(CarLog.TAG_SENSOR, "CAR dayNight handleSensorEvent NIGHT"); + } else { + mNightSetting = UiModeManager.MODE_NIGHT_NO; + if (DBG) Log.d(CarLog.TAG_SENSOR, "CAR dayNight handleSensorEvent DAY"); + } + if (mUiModeManager != null && (mForcedMode == FORCED_SENSOR_MODE)) { + mUiModeManager.setNightMode(mNightSetting); + if (DBG) Log.d(CarLog.TAG_SENSOR, "CAR dayNight handleSensorEvent APPLIED"); + } else { + if (DBG) Log.d(CarLog.TAG_SENSOR, "CAR dayNight handleSensorEvent IGNORED"); + } + } + public synchronized int forceDayNightMode(@DayNightSensorMode int mode) { if (mUiModeManager == null) { return -1; @@ -131,6 +135,15 @@ public class CarNightService implements CarServiceBase { } mCarPropertyService.registerListener(VehicleProperty.NIGHT_MODE, 0, mICarPropertyEventListener); + CarPropertyValue propertyValue = mCarPropertyService.getProperty( + VehicleProperty.NIGHT_MODE, 0); + if (propertyValue != null && propertyValue.getTimestamp() != 0) { + setNightMode((Boolean) propertyValue.getValue()); + } else { + Log.w(CarLog.TAG_SENSOR, "Failed to get value of NIGHT_MODE"); + // Initial in Night Mode + setNightMode(true); + } } @Override |