Merge commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036' into kraken
* commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036':
Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp
* commit '098e58da93f304d7d7791f193c6237870b94989d':
Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
This change unregisters a list's data observer from the adapter when the list
is detached from the window. The default data observer impl. is a non-static
inner class with a synthesized pointer to the list. Thus if an app keeps
the adapter around the list is also kept around. This can be a problem with
dialogs in particular.
Change-Id: Ia95a995d3f54b9caf1bbcd2c7239a0318511b08c
- Implement all of the state saving and restoring machinery. This
caused some flux in the API.
- Add ability to have fragments that are retained across activity
instances.
- Fix some bugs.
Change-Id: Ib6b5b0752d7f8d667cfdcd3e76d127cc9b6d901b
This avoids problems if the time is reset while shutting down.
Change-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae
Signed-off-by: Mike Lockwood <lockwood@android.com>
This change includes work in progress on a C++ library for both host and device
MTP and PTP support.
Currently the makefile builds two test programs:
mtptest - a command line test program that implements a small subset of device side MTP.
Requires a kernel driver that has not been checked in yet.
ptptest - a host tool to test USB host support for detecting and communicating with
digital cameras over PTP. Runs on Linux host.
Later this will be reformulated as a native library that will be used in the media process.
Change-Id: I81aab279975b600b59d99013ab97f9adf0b58da7
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '28fadef2ede2d74e9526266e779553bbd1dc66f4' into kraken
* commit '28fadef2ede2d74e9526266e779553bbd1dc66f4':
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Merge commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b' into froyo-plus-aosp
* commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b':
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Merge commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4' into kraken
* commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4':
Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
Previous Canvas changes missed a @hide tag, so droiddoc was complaining
about a missing method since that was also hidden.
Change-Id: Ib70a9fa2e20fe32b74ba901bb289e77583164004
Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken
* commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02':
Bug 2680071: Rename the Cloud to Device
Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp
* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
Bug 2680071: Rename the Cloud to Device
Adds drawTextRun as internal API on Canvas and GraphicsOperations.
Adds implementation to implementors of GraphicsOperations.
Adds state and API on Paint to control the bidi algorithm when used
by Canvas. This API is currently hidden.
The drawText changes are incomplete since shaping is not yet available
in the native code.
Change-Id: I4368048aef9545df0953a349381771603e04b619