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
With this change, all the vertex and fragment shaders used by the GL
renderer are now generated based on a program description supplied
by the caller. This allows the renderer to generate a large number
of shaders without having to write all the possible combinations by
hand. The generated shaders are stored in a program cache.
Change-Id: If54d286e77ae021c724d42090da476df12a18ebb
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 'cb61d132bc8ff26b7c81fb2fa7439808014f50b3'
* commit 'cb61d132bc8ff26b7c81fb2fa7439808014f50b3':
One last change to current.xml for new download manager API
Merge commit '9b8e5566f99c55222db4127719440272f63a5361' into gingerbread-plus-aosp
* commit '9b8e5566f99c55222db4127719440272f63a5361':
One last change to current.xml for new download manager API
Merge commit '4d5443762bd2b44b28edc2f2f75728911d70eac1' into gingerbread-plus-aosp
* commit '4d5443762bd2b44b28edc2f2f75728911d70eac1':
COMMENT ONLY change to clarify ContentProvider documentation.
Merge commit '86c035f0d176be9cb06b1e4f2390c25701417586' into gingerbread
* commit '86c035f0d176be9cb06b1e4f2390c25701417586':
COMMENT ONLY change to clarify ContentProvider documentation.
Merge commit '7feab3470156c7864fe159115d575c16f0974493' into gingerbread-plus-aosp
* commit '7feab3470156c7864fe159115d575c16f0974493':
Un-@hide new download manager public API.
Gets a little more specific about thread behavior, and makes
pointed comments about not doing too much work in onCreate().
Change-Id: I682f0eb7d7559babee901ed26642751a6ba0a1ea
Merge commit 'f7ad0aa005d18f4d934d9b085e969841e4fbf5c1'
* commit 'f7ad0aa005d18f4d934d9b085e969841e4fbf5c1':
Explicitly mention again that startCommand() runs on the main thread.
Merge commit '10f7c1b8ecf110fd9c646eb3fcb51e6ee74c5885' into gingerbread-plus-aosp
* commit '10f7c1b8ecf110fd9c646eb3fcb51e6ee74c5885':
Explicitly mention again that startCommand() runs on the main thread.
This is already mentioned at the top of Service.java's javadoc, but
I'm seeing people get confused (myself included the other day) after
getting used to incoming service stub binder calls being on their own
threads and forgetting that startCommand() didn't work that way.
Change-Id: Ib79f48d9368ac0ba2d37b7e4dc98d53804bcd59e
Merge commit '84c924a6c53cb63ca018013c9fda0077413d0005' into gingerbread-plus-aosp
* commit '84c924a6c53cb63ca018013c9fda0077413d0005':
Replace several IPCThreadState::get() lookups with one.
Merge commit '499bee34c40945f898b7561ca7792ded5b974852' into gingerbread-plus-aosp
* commit '499bee34c40945f898b7561ca7792ded5b974852':
Remove a log message Jason doesn't like
