Merge commit '57bd0615fa48124c4607fbb1ba09a7c7160be146' into gingerbread-plus-aosp
* commit '57bd0615fa48124c4607fbb1ba09a7c7160be146':
b/3054044 Make allDay event times format in utc
AllDay events could get formatted with the local time zone
instead of utc. This makes it so that using the utc flag in the
wrapper for formatting correctly passes in UTC as the time zone.
Change-Id: I65090ef939ce64c1a942c7683cf76a927c02cb53
Merge commit '0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp
* commit '0a69f597604254bc37721b135ab612eaacdd0cbd':
Rub in a little 'ol log-b-gone.
Merge commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94' into gingerbread-plus-aosp
* commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94':
Remove OBBs from state list when volume unmounted
Don't keep tracking OBBs when the volume they're located on goes away.
Remove them from our state tracking maps and then send a notification to
any listener that is still around.
Add a dump handler to MountService so the state of the mount lists
can be inspected.
Change the API to just make a callback directly to the change listener
when mount is called when it's already mounted or unmount called when
it's already unmounted.
Change-Id: Idb4afbb943ca5ca775825f908bff334e3ce1cfcc
Merge commit '4ba2817c869d4ec6b518a57ea32cc3765b18b0db' into gingerbread-plus-aosp
* commit '4ba2817c869d4ec6b518a57ea32cc3765b18b0db':
Avoid NPE when viewing failed legacy download with no local path
Merge commit '194f524456ebecbe13180146160a9b177cfb6be1' into gingerbread-plus-aosp
* commit '194f524456ebecbe13180146160a9b177cfb6be1':
Import revised translations. DO NOT MERGE
* Fix some typos in Javadoc and log messages.
* Remove redundant initializer in BluetoothAdapter.readOutOfBandData()
* Use canonical "UTF-8" charset name instead of "UTF8" in
BluetoothDevice.convertPinToBytes()
Change-Id: I58cd5dc48a7ad0053d204c5f590b4b3d438d8672
Merge commit '99f8c5ee621d78a24583a10e459ba40aab511a17' into gingerbread-plus-aosp
* commit '99f8c5ee621d78a24583a10e459ba40aab511a17':
Fix location of gdbserver upon installation
Merge commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7' into gingerbread-plus-aosp
* commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7':
Moved Rfc822 validator test
Merge commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada' into gingerbread-plus-aosp
* commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada':
Have download manager give more details when downloads are paused
Merge commit '2fb818ca7dd53d00646854a2473f1a69be43067c' into gingerbread-plus-aosp
* commit '2fb818ca7dd53d00646854a2473f1a69be43067c':
Fix the javadoc of Parameters.setRotation.
Merge commit '71e2486209856d33d027389be2bd4924a03c4f86' into gingerbread-plus-aosp
* commit '71e2486209856d33d027389be2bd4924a03c4f86':
New assets for status bar data_edge and overscroll
Canvas rotations are counterclockwise, orientation is clockwise,
so we need to mind the sign of the rotation.
Change-Id: I2a8b60599bd26e9dc3ced2e13942f846461333df
This change introduces more detailed reporting of why downloads are paused in
the download manager.
First, it adds new, more detailed status constants in android.provider.Downloads
for when a download is paused, in place of the old catch-all
STATUS_RUNNING_PAUSED. I've eliminated some dead code there as well to ease the
change.
Second, in the public API, it changes COLUMN_ERROR_CODE to COLUMN_REASON, which
now reports useful info for STATUS_PAUSED in addition to STATUS_FAILED. It adds
some new PAUSED_* constants for reason values when a download is paused, and
adds code to generate these values appropriately.
Change-Id: Ie617d1c2c59357375e19466086923ace5e2fb122
Merge commit 'a5c742bfd08df55849418cd1c77065ac54d83502' into gingerbread-plus-aosp
* commit 'a5c742bfd08df55849418cd1c77065ac54d83502':
Update local cache before sending intent.
Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp
* commit '212d81a004f50e51ed8f6d803b79f4b71546b351':
Move all the permissions check up for unmount