Merge commit '03b3de0faf7fe6b8e4bfbf828793767ac3e77a37'
* commit '03b3de0faf7fe6b8e4bfbf828793767ac3e77a37':
Continue trying to make the turn off quickly after call feature work.
Merge commit '8f0f1b1e9defc61c2831e8856b18f2e00cfd789d'
* commit '8f0f1b1e9defc61c2831e8856b18f2e00cfd789d':
Just disable widgets that come from apps on sd cards, because they don't work anyway.
Merge commit '32982c701cee6f73262200468419b80343a0bea7'
* commit '32982c701cee6f73262200468419b80343a0bea7':
Fix typo that makes apps on sd work better with app widgets.
Merge commit '00d1772d8cfb94066b757034055ac38897d161da' into gingerbread-plus-aosp
* commit '00d1772d8cfb94066b757034055ac38897d161da':
Continue trying to make the turn off quickly after call feature work.
Merge commit '797e688b3bebbf1f50a8ad08528740b064f79153' into gingerbread
* commit '797e688b3bebbf1f50a8ad08528740b064f79153':
Continue trying to make the turn off quickly after call feature work.
Merge commit '274ad9824a20b61dfbb785621567fd0414a965a4' into gingerbread-plus-aosp
* commit '274ad9824a20b61dfbb785621567fd0414a965a4':
Just disable widgets that come from apps on sd cards, because they don't work anyway.
Merge commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6' into gingerbread-plus-aosp
* commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6':
Fix typo that makes apps on sd work better with app widgets.
The previous implementation worked if the set timeout is short enough, which mine was. This one
carries the remaining amount of timeout override forward through all of the countdown steps.
Bug: 2844990
Change-Id: I040df22f9f9ddf98c355ac6845b7624e95f84f33
Merge commit '913a8925c07e854a80bf5df87561f290d3a56d61' into gingerbread-plus-aosp
* commit '913a8925c07e854a80bf5df87561f290d3a56d61':
DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
Merge commit '3003a017d312a55e3804d6cf4a80044b1f1d7993' into gingerbread-plus-aosp
* commit '3003a017d312a55e3804d6cf4a80044b1f1d7993':
Don't retain global ref to last inflated context.
Merge commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a'
* commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a':
Add dynamic uid info for tracking the sip service usage.
Merge commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe' into gingerbread-plus-aosp
* commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe':
Add dynamic uid info for tracking the sip service usage.
Merge commit '5a54e98022d640900f94102c077d8dff447f3c76'
* commit '5a54e98022d640900f94102c077d8dff447f3c76':
Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
Merge commit '6947cc594276df899a0c4662224455f40846bd0a' into gingerbread-plus-aosp
* commit '6947cc594276df899a0c4662224455f40846bd0a':
Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
Merge commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c'
* commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c':
Fix a fun bug with multiple service bindings from an activity.
Merge commit '50395e80718e77d27ec5e2d474b255e05de68d82' into gingerbread-plus-aosp
* commit '50395e80718e77d27ec5e2d474b255e05de68d82':
Fix a fun bug with multiple service bindings from an activity.
There was a flaw in the service management, when the same activity
is doing a bindService() for the same service IBinder. In this case
the activity would correctly keep a list of all generated connections,
however some other data structures would assume there is only one
connection per IBinder, and thus only remember the last.
When that last connection was unbound, the service would be destroyed
since it thought there were no more connections. Then when the
activity was finished, it would try to destroy the service again and
end up with an ANR because the service was already gone and would
not respond.
Change-Id: I59bde38bc24e78147b90b0a7cd525c2a1d20489f
We were using a flag so new broadcasts replaced old. If people are expecting
to see all the broadcasts they sometimes would fail.
bug:2892383
Change-Id: I63df17fe8f8c68f59e1ad6297fe93e169b4463b4
We dont plan to have asynchronous versions of the existing
synchronous calls since we have added more powerful
asynchronous calls. Remove functionality to check for
synchronous calls.
Also, remove unused sync call for fetching status
Change-Id: I2982cb7b2aabc88a63289d49686a6e3645085263
On some devices, switching the USB configuration to enable RNDIS can
result in multiple USB disconnect/reconnect events being generated.
Change-Id: Id0bfe54293bd51211f84976be2d72f8b1ad0100d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '80db4381c010c4dec74c2bf1e02380759e4ff97b' into gingerbread-plus-aosp
* commit '80db4381c010c4dec74c2bf1e02380759e4ff97b':
DO NOT MERGE Enable all networks on screen on