Merge commit '8fcb312f6ca409ca46812303a405e3403fe71e9a'
* commit '8fcb312f6ca409ca46812303a405e3403fe71e9a':
Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
Merge commit 'e77d40834589ec70abcf71d93a82d24ca6e5535b'
* commit 'e77d40834589ec70abcf71d93a82d24ca6e5535b':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Merge commit 'c1bb46e9d58f05449d8420c81f5cae06e1084ac2' into eclair-mr2-plus-aosp
* commit 'c1bb46e9d58f05449d8420c81f5cae06e1084ac2':
Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
Merge commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565' into eclair-mr2-plus-aosp
* commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Merge commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-mr2
* commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6':
Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-mr2
* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
This fixes another case where the screen would turn on when the keyguard is open but hidden by another activity.
Change-Id: I2b7c8a329036401709e96ded4f4c138041192a71
Signed-off-by: Mike Lockwood <lockwood@android.com>
Add Light subclass to replace LightsService light setting methods
Remove LightsService.setAttentionLight() and LightsService.pulseBreathingLight()
Add support for Wifi and Bluetooth lights
Change-Id: I707f53cda27481c25649f402567a665d52e9cb62
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '413eed9eb4fa8e3b76be46be3eb6e92675d423d4'
* commit '413eed9eb4fa8e3b76be46be3eb6e92675d423d4':
More elimination of Formatter (I was tired of waiting several
Merge commit 'ed8d33b7976c006b4bd28eb89cac36074e4eccf5' into eclair-mr2-plus-aosp
* commit 'ed8d33b7976c006b4bd28eb89cac36074e4eccf5':
More elimination of Formatter (I was tired of waiting several
Merge commit '86ef717e2660dbc914dcf68295fbf9943c45bc44'
* commit '86ef717e2660dbc914dcf68295fbf9943c45bc44':
Change the DropBoxManager API slightly (this is public, but not yet released) --
Merge commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365' into eclair-mr2-plus-aosp
* commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365':
Change the DropBoxManager API slightly (this is public, but not yet released) --
* changes:
Change the DropBoxManager API slightly (this is public, but not yet released) -- take a File instead of a ParcelFileDescriptor (gets opened internally) -- that way the caller doesn't have to worry about closing their PFD and so on. (Pretty much 100% of the time the caller will be uploading a file, anyway.)
Merge commit 'f6a1dab030095ad1ed58d387ff21a112bca5b610'
* commit 'f6a1dab030095ad1ed58d387ff21a112bca5b610':
Add setAttentionLight() to IPowerManager for the Phone app.
Merge commit 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b' into eclair-mr2-plus-aosp
* commit 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b':
Add setAttentionLight() to IPowerManager for the Phone app.
take a File instead of a ParcelFileDescriptor (gets opened internally) --
that way the caller doesn't have to worry about closing their PFD and so on.
(Pretty much 100% of the time the caller will be uploading a file, anyway.)
Merge commit 'a85a0ac1072c7653fdafa791416658154b76ac0d' into eclair-mr2-plus-aosp
* commit 'a85a0ac1072c7653fdafa791416658154b76ac0d':
close file descriptors passed to drop box
Merge commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b' into eclair-mr2-plus-aosp
* commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b':
Remove HardwareService and move vibrator support to VibratorService.
The lights support is only needed by PowerManagerService and NotificationManagerService, so we do not need a Binder API for it.
Move backlight and notification light support to new LightsService class.
The camera flash is now handled directly by the camera HAL, so the flash Hardware service flash support is obsolete.
Change-Id: I086d681f54668e7f7de3e8b90df3de19d59833c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'b29fefe6aeed68c22c7711263357348006ab8b79' into eclair-mr2-plus-aosp
* commit 'b29fefe6aeed68c22c7711263357348006ab8b79':
Copy SYSTEM_LAST_KMSG from /proc/last_kmsg instead of /data/dontpanic/last_kmsg.
...Binary XML file line #37: Error inflating class <unknown> after adding a secondary account
The problem was that we weren't dealing well with the situation where we start a transition
from activity A to B, then transition back to A before B is shown (it finishes before being
shown), then transition from A to C. At this point we had some state showing that we
were in the process of showing A from it being hidden (due to the middle transition from
B to A), which would cause the layout pass to ensure its window is hidden before the
transition starts.
The solution is to detect the case where we are showing a token and it is already actually
shown, and in this case not do all of the token setup for it to wait for its windows to
be displayed before it is shown. This isn't needed, the windows are already displayed
or the token is already set up to wait for them to be displayed.
Change-Id: I16925b91e1e2449dd65ade162a5758173c6e2695
Merge commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f' into eclair-mr2-plus-aosp
* commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f':
Add logging of headset events to help debug issue.
Merge commit '0d631b9b58db54bee58da717b38b8020bc3d0437' into eclair-mr2
* commit '0d631b9b58db54bee58da717b38b8020bc3d0437':
Add logging of headset events to help debug issue.
Merge commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a' into eclair-mr2-plus-aosp
* commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a':
Add window manager support for overriding button and keyboard backlight values.
