diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-06-10 09:04:32 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2010-06-10 09:04:32 -0700 |
commit | a919f3521aecc1eb40b60224f9dc8707659b91ee (patch) | |
tree | dd6c5ce6b7794dcdc65d08e18be2639f9f9ade3a | |
parent | ecf6af70c56fdd14694d2ad7a12dc65476691f01 (diff) | |
parent | d8415746c18c3014f5845e6fa83eb203c92d2e2b (diff) | |
download | passion-common-a919f3521aecc1eb40b60224f9dc8707659b91ee.tar.gz |
merge from open-source master
Change-Id: I210d9864de56445d1fed62f7913e9f254f859451
-rw-r--r-- | liblights/lights.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/liblights/lights.c b/liblights/lights.c index a6156d6..2850ac1 100644 --- a/liblights/lights.c +++ b/liblights/lights.c @@ -236,6 +236,8 @@ set_trackball_light(struct light_state_t const* state) if (state->flashMode == LIGHT_FLASH_HARDWARE) { mode = state->flashOnMS; period = state->flashOffMS; + period = (period < 2) ? 2 : period; + period = (period > 12) ? 12 : period; } LOGV("%s color=%08x mode=%d period %d\n", __func__, state->color, mode, period); @@ -262,7 +264,7 @@ set_trackball_light(struct light_state_t const* state) } trackball_mode = mode; -return write_int(&leds[JOGBALL_LED].brightness, mode); + return write_int(&leds[JOGBALL_LED].brightness, mode); } static void |