Merge commit '32c66ee4976857c0db80ebfcfe42d7627dc9d2a2'
* commit '32c66ee4976857c0db80ebfcfe42d7627dc9d2a2':
If the usage stats file doesn't exist in the first place there is no need to
Merge commit 'ccbf4c282f6d27602896b812485b41b74eaf8c6d' into eclair-mr2-plus-aosp
* commit 'ccbf4c282f6d27602896b812485b41b74eaf8c6d':
If the usage stats file doesn't exist in the first place there is no need to
Merge commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7' into eclair-mr2
* commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7':
If the usage stats file doesn't exist in the first place there is no need to
Merge commit 'ed6dd2e6a5921044ba841f17627d7a8cd444171a' into eclair-mr2-plus-aosp
* commit 'ed6dd2e6a5921044ba841f17627d7a8cd444171a':
Don't accidentally signal multiple exceptions in setThreadPriority()
Merge commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda' into eclair-mr2
* commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda':
Don't accidentally signal multiple exceptions in setThreadPriority()
Merge commit 'da32419584d6761bfcbcad6a72275dbc3cea50fe'
* commit 'da32419584d6761bfcbcad6a72275dbc3cea50fe':
Images.Media.DATE_TAKEN should be in milliseconds.
Merge commit 'a1a68a4a2d1b1c48b3dc98638cb2e498b6f65408'
* commit 'a1a68a4a2d1b1c48b3dc98638cb2e498b6f65408':
Add new unit test for RadioGroup/RadioButton.
Merge commit '48476b0ade7594a64612db2b867792737193b2ec' into eclair-mr2-plus-aosp
* commit '48476b0ade7594a64612db2b867792737193b2ec':
move event log tags used by system server into this package
Merge commit '8a576620cdc7257fc026026c77f7c946bfb760d1' into eclair-mr2-plus-aosp
* commit '8a576620cdc7257fc026026c77f7c946bfb760d1':
Images.Media.DATE_TAKEN should be in milliseconds.
Merge commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-mr2
* commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644':
Images.Media.DATE_TAKEN should be in milliseconds.
Merge commit '6d72f725f18a63afd68f14cc1e2ff8f21d254c77' into eclair-mr2-plus-aosp
* commit '6d72f725f18a63afd68f14cc1e2ff8f21d254c77':
Add new unit test for RadioGroup/RadioButton.
Merge commit '73d403324bd8af48b20fc1bbbb2cf3502f1407cd'
* commit '73d403324bd8af48b20fc1bbbb2cf3502f1407cd':
Check if another Activity wants to intercept an xml mime type.
Merge commit 'c593d60787e9abd75c94f70bd929ae13414411e9' into eclair-mr2-plus-aosp
* commit 'c593d60787e9abd75c94f70bd929ae13414411e9':
Check if another Activity wants to intercept an xml mime type.
After signalling an exception due to set_sched_policy() failing (probably
because the thread in question had exited before this function was called), we
proceeded to call setpriority() anyway, and raised *another* exception when it
also failed. We don't do this any more; we just bail after signalling the first
exception.
Change-Id: I397b6a93c73d3f0870176e26759f2bec33e56205
We can now locate event log tag definitions in individual packages
(and java constants for the tag numbers get auto-generated), so move
all the tags used by the system server into the package.
Cached views would, in some situations, not update if they contained an
animating child. This was caused by clearing the dirty cache flag too
early in View.buildDrawingCache().
Approved by Dr. No mcleron.
Change-Id: I8c5f2fc3e6605657e0da625d60d50b55bb133666
WebCore treats */*+xml as content that it can render. This prevents Activities
from intercepting those mime types. Check the same regular expression as
DOMImplementation and then use the PackageManager to look for a matching
Activity.
Requires a change to webcore.
Bug: 2256744
There's no need to have constants like OP_UNUSED_FF in the API. They
serve no purpose, and it makes life confusing when an opcode is defined
(does the "unused" one go away, breaking the API? do we have the real
definition and the "unused" definition simultaneously?).
Discussed / approved by API council.
Merge commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4'
* commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4':
Implement new MockContentProvider. Also make ContentProvider aware of the class.
Merge commit 'f345a094e90be664f7390d12d505a052ac4b064f'
* commit 'f345a094e90be664f7390d12d505a052ac4b064f':
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
Merge commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6'
* commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6':
don't reschedule syncs that failed with a tooManyRetries error
Merge commit 'f4eb754b1810a60e640401396c1f9a10be65dffa'
* commit 'f4eb754b1810a60e640401396c1f9a10be65dffa':
Two more uses of strlcpy that break the sim build. Now fixed.
