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 '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 '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 '8280c2b15f6875b2d387c05df23d264864eb9cd5' into eclair-mr2-plus-aosp
* commit '8280c2b15f6875b2d387c05df23d264864eb9cd5':
Implement new MockContentProvider. Also make ContentProvider aware of the class.
Rename the old MockContentProvider to MockIContentProvider since it is
more appropriate name.
Detail:
Current developers inevitably depend on the backend used by ContentProvider,
which is useful but not ideal nor "testable" from the view of them.
Current MockContentResolver only accepts exact "ContentProvider" class, not
IContentProvider interface, since we want to hide "IContentProvider" while
the old MockContentProvider implements IContentProvider and as a result some
methods we want to hide may be exposed to the public SDK now and probably
for the future.
On the other hand, ContentProvider is not interface but an exact class
heavily depends on the internal logic and not suitable for external
developers to use for tests.
The new MockContentProvider introduces the mock implementation
for ContentProvider.
It extends ContentProvider, so "is" ContentProvider, but tries to avoid
depending on any backend System like IPC in Android, etc.
This should be useful from the view of application developers who do not
want to be confused with ContentProvider/ContentResolver backend
implementation "at all" and want to use MockContentResolver without
any other ContentProvider implementations tightly connected to the
external worlds.
Merge commit '104d3f755e5ebc15d66154526c2c149beb33a7ee' into eclair-mr2-plus-aosp
* commit '104d3f755e5ebc15d66154526c2c149beb33a7ee':
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
Merge commit '39b082356851e29ba7a0af981eaa27d3b08a387b' into eclair-mr2-plus-aosp
* commit '39b082356851e29ba7a0af981eaa27d3b08a387b':
Add API level 8, currently a copy of 7.
Merge commit '298de218c540eab6c4e6c3415ab8a5c985c57772' into eclair-mr2-plus-aosp
* commit '298de218c540eab6c4e6c3415ab8a5c985c57772':
don't reschedule syncs that failed with a tooManyRetries error
Merge commit '0ce8431c15078e095a22a123dbabcd91049a9652' into eclair-mr2
* commit '0ce8431c15078e095a22a123dbabcd91049a9652':
don't reschedule syncs that failed with a tooManyRetries error
Merge commit '2a428fd463431e2b3d3680faf2e9640989ca7791' into eclair-mr2-plus-aosp
* commit '2a428fd463431e2b3d3680faf2e9640989ca7791':
Two more uses of strlcpy that break the sim build. Now fixed.
Merge commit '9737dc4de2ce56c5fb3d6911e48cfbfd63a19325' into eclair-mr2-plus-aosp
* commit '9737dc4de2ce56c5fb3d6911e48cfbfd63a19325':
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.
Merge commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e' into eclair-mr2-plus-aosp
* commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e':
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
Merge commit 'e08361d7fda2234f447f4ffb7f480d045f8c5f78' into eclair-mr2-plus-aosp
* commit 'e08361d7fda2234f447f4ffb7f480d045f8c5f78':
add BluetoothChat sample app to the dev guide
Merge commit '8d670d345893fb9b9566f6b8c20202b77d4d211a' into eclair-mr2-plus-aosp
* commit '8d670d345893fb9b9566f6b8c20202b77d4d211a':
I accidentally broke this code while refactoring MediaScanner. This is the fix.
Merge commit '67d9aa15b6c6217a7d3b7b017924af132d048e56' into eclair-mr2-plus-aosp
* commit '67d9aa15b6c6217a7d3b7b017924af132d048e56':
Add isPrintableAscii() and isPrintableAsciiOnly() to TextUtils.java as hidden methods, and make vCard code use them.
