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
It was measuring the text to try to determine the size that it needed to
scale the emoji character to. Unfortunately it was accidentally trying
to measure the character under the cursor instead of the emoji character
itself, which is wrong, but more seriously doesn't work at all when the
cursor is at the end of the line.
This was already fixed before in change 144474, but that change never got
merged over to donut. So this merges it now.
Bug 2087915
Change-Id: Ib4804d330a029a966207b3b07271f84e6b2652c0
* changes:
When we get 304 and switch to cacheLoader, need to set mFromCache to be true. So that the cache loading will not create a new mCacheResult which overwrites the old cache data.
Merge commit '153b0226e1f2e60941c420ea1bc8f65cf51c2f50'
* commit '153b0226e1f2e60941c420ea1bc8f65cf51c2f50':
Fix a docs comment to match the parameter name.
Use the fact that the scroller keeps track of the current velocity
to accelerate subsequent flings. The current velocity is added to
the new velocity if the flings are in the same general direction
and if the fling animation hasn't been aborted.
This makes it easier to move to the top or bottom of very large
pages (either in overview mode or reading mode) by taking
consecutive flings as a cue from the user that they want to
page faster. The user can stop the fling with any action as
before.
fixes http://b/issue?id=2066090
This change adds the EventHandler error codes to WebViewClient for the public
api. Previously, the api was ambiguous about the value of the errorCode
parameter and falsely documented that the values are HTTP status codes.
Merge commit '765f49e22d7dbf608710baa95e9769b9133d9483'
* commit '765f49e22d7dbf608710baa95e9769b9133d9483':
re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
Merge commit '85655ebcd9dc521e3c11209d24afee432d18b596'
* commit '85655ebcd9dc521e3c11209d24afee432d18b596':
Prevent ListView from scrolling/flinging its content when the content fits on screen.
Merge commit 'a27b7822200ab8f7a1978ca27ae3e14929b9d665'
* commit 'a27b7822200ab8f7a1978ca27ae3e14929b9d665':
Revert "- don't schedule syncs that we will never dispatch"
