Unfortunatley, shutdown() on the underlying fd does not actually stop a
listening socket from listening. You need to call close() on the fd to
do this. There is no way around it.
So this means the Java BluetoothSocket code has to call destroyNative() during
BluetoothSocket.close().
Since native methods cannot be called after destroyNative(), add a ReadWrite
lock and mClosed field to protect access to native methods.
This fixes the "resource busy" error when Bluetooth OPP and Bluetooth PBAP
tried to resume listening after turning BT off and then on.
Merge commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e' into eclair-plus-aosp
* commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e':
Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
we keep book and only read a particular file once and send it to the server.
The files are:
Ramconsole Driver (Dream/Sapphire):
/data/dontpanic/last_kmsg
Apanic Driver (Sholes/all future designs):
/data/dontpanic/apanic_console
/data/dontpanic/apanic_threads
Merge commit 'bb54f93ff66f382dc706b9fff508d386e046fdc2' into eclair-plus-aosp
* commit 'bb54f93ff66f382dc706b9fff508d386e046fdc2':
Adding a convenience method to resolve contact lookup URI to a regular content URI
Merge commit '9b6a8ab8221f2df20c32711b0f1e4f301165fac2' into eclair-plus-aosp
* commit '9b6a8ab8221f2df20c32711b0f1e4f301165fac2':
Add camera parameters constants and methods.
Merge commit '9073dc69b110cbd0d4bebd128ed6cc2b24a16695'
* commit '9073dc69b110cbd0d4bebd128ed6cc2b24a16695':
Expand apps' control over the settings restore process
Merge commit '9756a70bd92fb844d2fd8346cc4bb6c8bb768c4b' into eclair-plus-aosp
* commit '9756a70bd92fb844d2fd8346cc4bb6c8bb768c4b':
Expand apps' control over the settings restore process
Applications can now specify two more aspects of the restore process: whether
they need to run with their own custom Application subclass rather than being
launched in the usual restricted mode during restore, and whether it's okay for
the backup manager to kill the app process once restore has completed. The new
manifest attributes for these are, respectively, android:restoreNeedsApplication
and android:killAfterRestore.
If unspecified in the manifest, restoreNeedsApplication is false, and
killAfterRestore is true.
In order to support kill-after-restore cleanly, this change also adds a new
system-process-only interface to the Activity Manager, which will schedule a
"commit suicide" event on the target app's main thread looper.
The framework backup agents have been given the appropriate new backup
attributes as well.
Merge commit 'a457424bfb7991d648aa7620549a09205f8acd13'
* commit 'a457424bfb7991d648aa7620549a09205f8acd13':
Wait for HCI to come up if getting the adapter path fails.
Merge commit 'c937b5ce4ff2f39fd9c60f718f98550a932b62f0' into eclair-plus-aosp
* commit 'c937b5ce4ff2f39fd9c60f718f98550a932b62f0':
Wait for HCI to come up if getting the adapter path fails.
Merge commit 'd862c3ccdbfba5082df34fbb736a94d993dc064c'
* commit 'd862c3ccdbfba5082df34fbb736a94d993dc064c':
- don't schedule syncs that we will never dispatch
Merge commit '04f6da353d4e79f49ba1d4897ed617e91acc3f77' into eclair-plus-aosp
* commit '04f6da353d4e79f49ba1d4897ed617e91acc3f77':
- don't schedule syncs that we will never dispatch
AccountManagerService.SimWatcher was checking if storedImsi = "initial"
instead of null as an initial condition. Also, on NV-only CDMA devices
we were only sending SIM_STATE_CHANGED notifications when the radio
powered down, which meant storedImsi was only initialized if the radio
powered down.
Merge commit '775745c40c27f1131a98fa2857f061324c6b7709'
* commit '775745c40c27f1131a98fa2857f061324c6b7709':
When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue.
Merge commit '513069c39cd6610db2919c09abea2ff73158356a' into eclair-plus-aosp
* commit '513069c39cd6610db2919c09abea2ff73158356a':
Make a path constant
In practice, no one ever writes an apostrophe in an aapt string with the
intent of using it to quote whitespace -- they always mean to include a
literal apostrophe in the string and then are surprised when they find
the apostrophe missing. Make this an error so that it is discovered
right away instead of waiting until late in QA or after the strings have
already been sent for translation. (And fix a recently-introduced string
that has exactly this problem.)
Silence the warning about an empty span in a string, since this seems to
annoy people instead of finding any real problems.
Make the error about having a translated string with no base string into
a warning, since this is a big pain when making changes to an application
that has already had some translations done, and the dead translations
should be removed by a later translation import anyway.
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 '3b8916c25bd56e4847f57bf8286542bbe50c84d5'
* commit '3b8916c25bd56e4847f57bf8286542bbe50c84d5':
Some fixes to SMS processing in the framework.
Merge commit 'ac7d821d1aa9646ad977e450f57ec291df9e023d'
* commit 'ac7d821d1aa9646ad977e450f57ec291df9e023d':
Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
Merge commit 'ec6b9406593ba44f3e21ebdb5516301e12ebcee6'
* commit 'ec6b9406593ba44f3e21ebdb5516301e12ebcee6':
Breaking sleep after yield into small quanta.
Merge commit '93ca790c025d51780bff9be42cffdd0055091edb'
* commit '93ca790c025d51780bff9be42cffdd0055091edb':
Various infrastructure to support a running services UI.
Merge commit '8a6129d549dae5836ac5e9065bba9edd02fbdb92'
* commit '8a6129d549dae5836ac5e9065bba9edd02fbdb92':
Create new hdpi versions of 1x data statusbar icons.
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.
