Merge commit 'ca84ac88c7f6940677f9b796b21779e53965bf06'
* commit 'ca84ac88c7f6940677f9b796b21779e53965bf06':
base: process: Abort setting the process group if one of the threads fails to switch
Merge commit 'b06ecc401160c5906fd1f4c85f61163bc2875200'
* commit 'b06ecc401160c5906fd1f4c85f61163bc2875200':
Remove old hack A/V sync hack that is no longer needed.
Merge commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997'
* commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit '25bd4f29e1720d78d164c9749f786a2add6cafe9'
* commit '25bd4f29e1720d78d164c9749f786a2add6cafe9':
dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
EGL10.EGL_NO_XXX objects for displays, surfaces, and contexts.
This allows clients to compare the returned object against
the public EGL10.EGL_NO_XXX object using a simple == operation.
This fixes bug 2303947 "Java layer EGL API makes it difficult
to tell when certain methods have failed"
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 '20b213c7dd9d18d092a60ea176dd83cc29d6be80'
* commit '20b213c7dd9d18d092a60ea176dd83cc29d6be80':
Document that stopPreview is not needed before takePicture.
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.
Merge commit '2d6d609c9ede7ed8924001df00af9c13effab8ad' into eclair-mr2-plus-aosp
* commit '2d6d609c9ede7ed8924001df00af9c13effab8ad':
Squashed commit of the following:
Merge commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a' into eclair-mr2-plus-aosp
* commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a':
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Merge commit 'd345c6acedb22c9408553ef9f38c196984177e6b' into eclair-mr2-plus-aosp
* commit 'd345c6acedb22c9408553ef9f38c196984177e6b':
base: process: Abort setting the process group if one of the threads fails to switch
Merge commit '11a2853e0196905e25a2dc5c227320688e04e950' into eclair-mr2-plus-aosp
* commit '11a2853e0196905e25a2dc5c227320688e04e950':
Add support for Car Dock.
Merge commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b' into eclair-mr2-plus-aosp
* commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b':
docs: fix markup error in xml sample
Merge commit '7c09a0ff365d6df96e880422a7b389ddf63401da' into eclair-mr2-plus-aosp
* commit '7c09a0ff365d6df96e880422a7b389ddf63401da':
Remove old hack A/V sync hack that is no longer needed.
Merge commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc' into eclair-mr2-plus-aosp
* commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit '6d1ec0d81cd8ecdd390b31e724bac554bb955a94' into eclair-mr2-plus-aosp
* commit '6d1ec0d81cd8ecdd390b31e724bac554bb955a94':
dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
Merge commit '5c49a9080df9e46193efa8326318c86bc8976eea' into eclair-mr2
* commit '5c49a9080df9e46193efa8326318c86bc8976eea':
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.
* changes:
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 '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6' into eclair-mr2
* commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6':
add BluetoothChat sample app to the dev guide
