Merge commit 'c937b5ce4ff2f39fd9c60f718f98550a932b62f0' into eclair-plus-aosp
* commit 'c937b5ce4ff2f39fd9c60f718f98550a932b62f0':
Wait for HCI to come up if getting the adapter path fails.
Merge commit '2d2d5c4372b8ea5cf925c838b2149686211445af' into eclair-plus-aosp
* commit '2d2d5c4372b8ea5cf925c838b2149686211445af':
Update 4.xml to the most recent APIs.
Merge commit 'c804efe278fa33555e6e836504a467cb14505eb3' into eclair
* commit 'c804efe278fa33555e6e836504a467cb14505eb3':
Update 4.xml to the most recent APIs.
Merge commit '04f6da353d4e79f49ba1d4897ed617e91acc3f77' into eclair-plus-aosp
* commit '04f6da353d4e79f49ba1d4897ed617e91acc3f77':
- don't schedule syncs that we will never dispatch
Merge commit 'b1461fb4824f872faff40b206383d5e0faeda2ea' into eclair-plus-aosp
* commit 'b1461fb4824f872faff40b206383d5e0faeda2ea':
Modify the gain after filtering to prevent TTS clipping in en-US.
Merge commit '65d62c774e42d8bf9a55ef50e153ffc9e277ef37' into eclair-plus-aosp
* commit '65d62c774e42d8bf9a55ef50e153ffc9e277ef37':
Add hasIccCard to IccCard and TelephonyManager.
Expose the presence/absence of IccCards in the system.
This is needed to fix bug 2033811 which needs to show
some SIM menus in the Mms app and Contact apps only if
there is a SIM and on CDMA there is no sims yet.
The current implementation assumes CDMA never has an
IccCard this is true at the moment but needs to change.
Change-Id: I4167368e364623ea68e9b2778556e6d730b1e715
Merge commit '03a3327badda54728de2ca969b31b53f5ad9ad3a' into eclair-plus-aosp
* commit '03a3327badda54728de2ca969b31b53f5ad9ad3a':
dumpstate: Add support for apanic crash data
Merge commit '513069c39cd6610db2919c09abea2ff73158356a' into eclair-plus-aosp
* commit '513069c39cd6610db2919c09abea2ff73158356a':
Make a path constant
Merge commit '9217c45829da4d0c9c9dbdc6bc950c7f3e03e4f5' into eclair-plus-aosp
* commit '9217c45829da4d0c9c9dbdc6bc950c7f3e03e4f5':
When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue.
We need to pass them to WebViewCore as they are per process base. If we drop
them, the counter in the JWebCoreJavaBridge can be out of order.
Part 2 of fixing http://b/issue?id=2087410
Merge commit 'a01726a7fdd872cd8e1e8a9dfa52fb9cdbf01019' into eclair-plus-aosp
* commit 'a01726a7fdd872cd8e1e8a9dfa52fb9cdbf01019':
Some fixes to SMS processing in the framework.
Always process class 0 and other unstored SMS (eg, MWI). We were
rejecting all SMS messages in storage full situations, but certain
messages do not require storage.
Also, notify apps when the framework rejects MT SMS, with new
SMS_REJECTED_ACTION intent.
b/2066775
b/2015906
Merge commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f' into eclair-plus-aosp
* commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f':
Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
Merge commit '6ff270fd854d7c62f857998446fccb803004f1c3' into eclair-plus-aosp
* commit '6ff270fd854d7c62f857998446fccb803004f1c3':
Breaking sleep after yield into small quanta.
Merge commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9' into eclair-plus-aosp
* commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9':
Various infrastructure to support a running services UI.
This is necessary partly for general hygiene, but mostly because we need
to be able to determine based on the intent type what style URI to
return in the case of startActivityForResult().
Change-Id: Ib313d830b8646a70d5ac3ded11597af614429262
Rationale: there is no reason to sleep for 4 seconds between
transactions if there is no one using the database. This long
sleep only makes sense if two threads are actively using
the database yielding to each other every several seconds.
Merge commit '87b455f5581b3cc3edb9003592a11a1a43104109' into eclair-plus-aosp
* commit '87b455f5581b3cc3edb9003592a11a1a43104109':
Set a default dump type for DRT as a workaround for indeterministic order in receiving dumpAsText and onPageFinish callback.
Merge commit '0c91f5a3b20fea1c937212c2aeec073128f6fdc3' into eclair-plus-aosp
* commit '0c91f5a3b20fea1c937212c2aeec073128f6fdc3':
Create new hdpi versions of 1x data statusbar icons.
