Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken
* commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9':
Use integer for loop counter instead of float
New test in FrameworkTest for the VelocityTracker class
Preserve '+' in phone numbers imported from SIM.
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 avoids problems if the time is reset while shutting down.
Change-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae
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.
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
the new TextureMagager class now handle texture creation and upload
as well as EGL image creation and binding to GraphicBuffers. This is
used indirectly by Layer and directly by LayerBuffer
the new BufferManager class handles the set of buffers used for a
Layer (Surface), it abstracts how many buffer there is as well as
the use of EGLimage vs. regular texture ops (glTexImage2D).
Change-Id: I2da1ddcf27758e6731400f6cc4e20bef35c0a39a
this hack was used for gpus that don't support cached buffers
for s/w clients. currently we have no gpu with this issue.
this removes quite a bit of complexity.
Change-Id: I72564669f124f92805030e61983711f61c76b6d9
Merge commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27' into kraken
* commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27':
The default AlertDialog allows cancel. But the default
Merge commit '336d7dcb105a43ee4de51fd0f26f277c63662f02' into froyo-plus-aosp
* commit '336d7dcb105a43ee4de51fd0f26f277c63662f02':
The default AlertDialog allows cancel. But the default
Merge commit '79090cb3da132d07cd3888ef9242df9872fb4aa1' into kraken
* commit '79090cb3da132d07cd3888ef9242df9872fb4aa1':
Change license for the UUS Information file.
Remove ProximityAlerts Receiver when last ProximityAlert expires.
