Merge commit '50576fa8152557a25e1a231c66d694fffbab34d6'
* commit '50576fa8152557a25e1a231c66d694fffbab34d6':
Start app with several activities with intent filter [Main, Launcher] was broken
Merge commit 'd7da5164ba7744992fbc893c1c812614b0d57d8c'
* commit 'd7da5164ba7744992fbc893c1c812614b0d57d8c':
Telephony: Process MT SMS with MTI set to 3
Merge commit '57de95a51ff5d98fcad0a7735c496be5f647d66f'
* commit '57de95a51ff5d98fcad0a7735c496be5f647d66f':
Download manager support for file URIs + last modified time
Merge commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c' into gingerbread-plus-aosp
* commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c':
Download manager support for file URIs + last modified time
Merge commit '5473434f060d8c036a30a1992b036a2f70da265d'
* commit '5473434f060d8c036a30a1992b036a2f70da265d':
Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
Merge commit '97eb728aef51646b86925557a36732598e3fbaa1' into gingerbread-plus-aosp
* commit '97eb728aef51646b86925557a36732598e3fbaa1':
Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
Merge commit '43429036f5885063e522603e51c5f59f8b9e697a'
* commit '43429036f5885063e522603e51c5f59f8b9e697a':
Fix deadlock when switching between two GLSurfaceViews
Merge commit 'f8d9379bd834573feca085284970cf686993c330'
* commit 'f8d9379bd834573feca085284970cf686993c330':
IME events are now dispatched to native applications.
Merge commit '91216a7e7406ef02d833e461d0db93ece7b2140d' into gingerbread-plus-aosp
* commit '91216a7e7406ef02d833e461d0db93ece7b2140d':
Fix deadlock when switching between two GLSurfaceViews
Some devices only support a single active EGL context.
On those devices, when a second activity that uses a GLSurfaceView
is started in the same process, the second activity can potentially
hang in GLSurfaceView.onWindowResize waiting for its GLSurfaceView
render thread to draw a frame. The second activity's render thread
is waiting to acquire an EGL context, but the first activity's render
thread doesn't know it should release the EGL context.
The fix is to detect the potential hang, and ask the first activity's
render thread to release the EGL context.
Change-Id: Ibb342c68772297744c973bcf5010581cd132db67
Merge commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320' into gingerbread-plus-aosp
* commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320':
IME events are now dispatched to native applications.
And also:
- APIs to show and hide the IME, and control its interaction with the app.
- APIs to tell the app when its window resizes and needs to be redrawn.
- API to tell the app the content rectangle of its window (to layout
around the IME or status bar).
There is still a problem with IME interaction -- we need a way for the
app to deliver events to the IME before it handles them, so that for
example the back key will close the IME instead of finishing the app.
Change-Id: I37b75fc2ec533750ef36ca3aedd2f0cc0b5813cd
First, in the download manager public API, I'm changing
COLUMN_REQUESTED_TIMESTAMP to COLUMN_LAST_MODIFIED_TIMESTAMP, a field
that already exists in the download manager. Upon inspection of
existing users of this field, it looks like there are some good use
cases -- for instance, looking at when a download completed. And if
I'm exposing that timestamp, there's no need to also expose the
requested timestamp.
Second, this change includes support for file URI destinations:
* add DESTINATION_FILE_URI for use by the DownloadManager wrapper
* make DownloadManager use it appropriately
The backend support is in a separate change (since it's in a separate
project).
Also fixing a bug with file URI construction when DownloadManager
fills in COLUMN_LOCAL_URI.
Change-Id: I5bb93a222cd23215c2a03ed9f68d7f140454f7f2
Used as a bag to hold ipaddr, gateway, dns, proxy info.
addr's are InetAddresses for v4/v6 use. Cleaning up some old v4-only code
bug:2655015
Change-Id: I7ac886fe5c519e8bab42f49cd82a5189d9c9ab59
