Merge commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188'
* commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Merge commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f' into gingerbread-plus-aosp
* commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
The type of the cmd, cmdSize and *pReplySize parameters of the effect control interface command()
function have been modified from int to uint32_t. This is more consistent with their role.
Change-Id: I84d289fc262d6753747910f06f485597dfee6591
Merge commit 'd5786b982c90632a4b35fd2d984c4edc4bbdfb0b'
* commit 'd5786b982c90632a4b35fd2d984c4edc4bbdfb0b':
Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state
Merge commit 'c40d714ca520257bcb5ef2e03e83ea3273d3a0ec' into gingerbread-plus-aosp
* commit 'c40d714ca520257bcb5ef2e03e83ea3273d3a0ec':
Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state
a. The CountryDetector detects the country the user is in
in order of mobile network, location, sim card or locale.
It will be used by contact and contact provider.
b. All added APIs are hidden at this stage.
Change-Id: I4ba278571ffb6ab6ded0996d4f440a18534f8ed4
Merge commit '931ee98cc05aedaf0a7cdf0b7ec503a8586359f5'
* commit '931ee98cc05aedaf0a7cdf0b7ec503a8586359f5':
Cap the size of StrictMode buffering we do before calling DropBox.
Merge commit 'b73045935cd8ec5d1a1c5e7a7ca800448b5789ea' into gingerbread-plus-aosp
* commit 'b73045935cd8ec5d1a1c5e7a7ca800448b5789ea':
Cap the size of StrictMode buffering we do before calling DropBox.
Merge commit '499bee34c40945f898b7561ca7792ded5b974852' into gingerbread-plus-aosp
* commit '499bee34c40945f898b7561ca7792ded5b974852':
Remove a log message Jason doesn't like
Merge commit '070433edee72de5fd9b93ddf055f74277f0deff4'
* commit '070433edee72de5fd9b93ddf055f74277f0deff4':
Add a method to let a properly permissioned app directly
Merge commit '76d9bf52f31b8f31f64348b736422861c90ab463' into gingerbread-plus-aosp
* commit '76d9bf52f31b8f31f64348b736422861c90ab463':
Add a method to let a properly permissioned app directly
Merge commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917' into gingerbread
* commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917':
Add a method to let a properly permissioned app directly
Merge commit '02c06410461e3880c6ad2c0d15637438113adb4e'
* commit '02c06410461e3880c6ad2c0d15637438113adb4e':
SensorService handles last known state properly
Merge commit '14bfa398a4e8697ce5822861a684b7d1245e4a85' into gingerbread-plus-aosp
* commit '14bfa398a4e8697ce5822861a684b7d1245e4a85':
Infrastructure to report running services to developer.
Merge commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d' into gingerbread-plus-aosp
* commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d':
Report sensor events to BatteryStats service
Merge commit 'f88ed6c2ce750fcf7fb23778286e15557de758f9' into gingerbread-plus-aosp
* commit 'f88ed6c2ce750fcf7fb23778286e15557de758f9':
SensorService handles last known state properly
manipulate the user activity timeout. We should come up
with a better API for this, but this is for a last minute
power manager hack to turn off the screen sooner after a
phone call ends.
Change-Id: I76422f952e3e894c90b3311e7d889899c79cbbaa
SensorService now correctly sends the last known
state of a sensor as soon as a new connection is made.
This fixes the issue where, for instance, an application
could wait a long time before getting the light or proximity
sensor initial state.
Change-Id: Ic41392f3626e26c4f15746c7e17c7ecd44bbb10b
Merge commit '422e700ee4f312c7d3c87e26bc2b0c7061c9aa8a'
* commit '422e700ee4f312c7d3c87e26bc2b0c7061c9aa8a':
propagate sensor event rate properly to the sensor HAL
Merge commit 'db3eb3553502d142c85d47ec4fb847b7fa3b06fa' into gingerbread-plus-aosp
* commit 'db3eb3553502d142c85d47ec4fb847b7fa3b06fa':
propagate sensor event rate properly to the sensor HAL
Merge commit '994fff705ee8a7a8e9826ade53a5220949a28192'
* commit '994fff705ee8a7a8e9826ade53a5220949a28192':
SensorService doesn't crash if correct HAL is not present
