Merge commit 'db7dde6bd3f6352bb9af3b03232a9407a53d87e2'
* commit 'db7dde6bd3f6352bb9af3b03232a9407a53d87e2':
Adding a convenience method to resolve contact lookup URI to a regular content URI
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 '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
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
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 '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.
Merge commit 'f84b803478eeb3ce34da55f242d9b9685c6c943d'
* commit 'f84b803478eeb3ce34da55f242d9b9685c6c943d':
Fix an emoji-measuring bug that caused an exception when editing a contact.
Merge commit '0d71db4979426c20972e5c1c4488fbf27c3b2863'
* commit '0d71db4979426c20972e5c1c4488fbf27c3b2863':
Fix issue 2077333: The volume key will effect both ring and media vol at the same time.
Merge commit '1b0f6e82f6b4e34109117b77db156cd53da1be94'
* commit '1b0f6e82f6b4e34109117b77db156cd53da1be94':
if exception getMessage() is null, don't add it to the error
Merge commit '75e05a5dbbbb75bb8e1b8f0fb3ff52c7baa8968d'
* commit '75e05a5dbbbb75bb8e1b8f0fb3ff52c7baa8968d':
When we get 304 and switch to cacheLoader, need to set mFromCache to be true.
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 '56205fea879543a50bb797016832416a8b48cabb' into eclair
* commit '56205fea879543a50bb797016832416a8b48cabb':
Fix an emoji-measuring bug that caused an exception when editing a contact.
Some of this is temporary (in particular the two approaches for getting
process memory, one working but horrible, the other not working but
preferred) until I figure out the best way to do it.
Change-Id: I8c8f25062d481fcea22a47d459b083d2fd8a5040
