Merge commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42' into gingerbread-plus-aosp
* commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42':
SIP: Feedback any provisional responses in addition to RING
Merge commit 'd9743af92ead39b9f648043d165c415dfe8f3668' into gingerbread-plus-aosp
* commit 'd9743af92ead39b9f648043d165c415dfe8f3668':
New assets. DO NOT MERGE>
Merge commit '37a3631edfb1b848daca23bf5a12e1ab4bb6e096' into gingerbread-plus-aosp
* commit '37a3631edfb1b848daca23bf5a12e1ab4bb6e096':
Add line break between PLMN and SPN in windowshade.
Merge commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399' into gingerbread-plus-aosp
* commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399':
Move DownloadManager to android.app (DO NOT MERGE)
Merge commit 'be0450619528e65eebfa1d7eab78fde757d094cc' into gingerbread-plus-aosp
* commit 'be0450619528e65eebfa1d7eab78fde757d094cc':
Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
Merge commit '4769f57948455277d0670ef18f64824ca5d894c1' into gingerbread-plus-aosp
* commit '4769f57948455277d0670ef18f64824ca5d894c1':
Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
Merge commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7' into gingerbread-plus-aosp
* commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7':
Squashed commit of the following:
Merge commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5' into gingerbread-plus-aosp
* commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5':
Fixes to granting URI permissions - take into account path perms.
The only exception is TRYING.
Also remove an unused import in SipSessionGroup.
http://b/issue?id=3021865
Change-Id: I160982b0c4b417362f1fb961217db90c3a585ce5
and fix how SipErrorCode.SERVER_ERROR is determinted from server response, not
from local exceptions.
http://b/issue?id=3041332
Change-Id: Idce67e29858d5c7573b98b7fa1fac074913d71d6
Merge commit '245475925eff61ee76bde58de69253a889e39d0a' into gingerbread-plus-aosp
* commit '245475925eff61ee76bde58de69253a889e39d0a':
Fix the startAudio order for 3-way calls.
Merge commit '9c37447e5c3555e4063777e4ef82e355e57f4c68' into gingerbread-plus-aosp
* commit '9c37447e5c3555e4063777e4ef82e355e57f4c68':
Fix pointer index when splitting secondary pointers.
Merge commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4' into gingerbread-plus-aosp
* commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4':
Don't enter DISCONNECTING state when the call/connection is not alive
This is a manual cherrypick of:
Change I3a76de15: Fixing font scale in WindowManagerService. There was
a bug that causes WindowManagerService to lose the fontScale setting.
Change-Id: I9b993e11f6a3e75735d8ed05596083893543d732
Changing package at hackbod's request. I'll merge this manually, as
there's some additional master-only code that will be to be
simultaneously changed.
Change-Id: Ibb629ec1c31807fbee31e0193c6a941d04be0117
The dump function whitelists several directories as filters to the output.
The mount point changed for SD card in Froyo, and we started filtering files
that were open on the SD card. This fix changes the filter for the SD card,
and adds the directory for data files as well.
Change-Id: I61b67c3d11d93dbd530e8b3566000e79bc037137
Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp
* commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3':
Move SipService out of SystemServer to phone process.
Merge commit '8d7057df401af668335c38273bc62872e4dbf538' into gingerbread-plus-aosp
* commit '8d7057df401af668335c38273bc62872e4dbf538':
Updated assets in status bar. DO NOT MERGE.
Unlock has a 1 pixel offset that has to be fixed by code.
dropdown untested on device.
Most of these should be removed from SystemUI (revert 68833).
Pass 4.
Change-Id: Ibbbe4cc404151ec28768af98509082d77b303abe
Merge commit '23142acffab69738b967812fdbdf7bbda18a44d8' into gingerbread-plus-aosp
* commit '23142acffab69738b967812fdbdf7bbda18a44d8':
squeeze a few more bits of randomness into /dev/random
