OSDN Git Service
Andreas Huber [Mon, 4 Oct 2010 18:22:22 +0000 (11:22 -0700)]
am
7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread
Merge commit '
7fa693740756123fa9d05e62fb47aae5d703c71d' into gingerbread-plus-aosp
* commit '
7fa693740756123fa9d05e62fb47aae5d703c71d':
Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
Andreas Huber [Mon, 4 Oct 2010 18:20:21 +0000 (11:20 -0700)]
Merge "Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread
Dirk Dougherty [Mon, 4 Oct 2010 18:16:12 +0000 (11:16 -0700)]
am
30f57295: am
ba944ccd: Doc change: update screens support table and remove outdated density/size metrics.
Merge commit '
30f572956ef92e8636772be7bd5d0150cf7fd1fc' into gingerbread-plus-aosp
* commit '
30f572956ef92e8636772be7bd5d0150cf7fd1fc':
Doc change: update screens support table and remove outdated density/size metrics.
Dirk Dougherty [Mon, 4 Oct 2010 18:12:07 +0000 (11:12 -0700)]
am
ba944ccd: Doc change: update screens support table and remove outdated density/size metrics.
Merge commit '
ba944ccda3d61ccbe6061277fcc50c96fe2643f1' into gingerbread
* commit '
ba944ccda3d61ccbe6061277fcc50c96fe2643f1':
Doc change: update screens support table and remove outdated density/size metrics.
Andreas Huber [Mon, 4 Oct 2010 18:09:31 +0000 (11:09 -0700)]
Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
Change-Id: Iaf5880bb3376f9cbf22aefe198878eaf6f3f08c7
related-to-bug:
3037389
Mindy Pereira [Mon, 4 Oct 2010 17:13:32 +0000 (10:13 -0700)]
am
106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread
Merge commit '
106950f20bd352ed72ddf4490b2e19d305e36a74' into gingerbread-plus-aosp
* commit '
106950f20bd352ed72ddf4490b2e19d305e36a74':
DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.
Mindy Pereira [Mon, 4 Oct 2010 17:10:06 +0000 (10:10 -0700)]
Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread
Dirk Dougherty [Thu, 23 Sep 2010 15:56:13 +0000 (08:56 -0700)]
Doc change: update screens support table and remove outdated density/size metrics.
Change-Id: I05895b09e2198379a078c12489a2098f84865f58
Daisuke Miyakawa [Mon, 4 Oct 2010 15:36:27 +0000 (08:36 -0700)]
am
d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
Merge commit '
d8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp
* commit '
d8f1a540162e16d88cae9a1e8ec58cba68adf6e2':
Refrain warning when not appropriate. Do not merge
Daisuke Miyakawa [Mon, 4 Oct 2010 15:31:56 +0000 (08:31 -0700)]
Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
Daisuke Miyakawa [Mon, 4 Oct 2010 14:59:34 +0000 (07:59 -0700)]
Refrain warning when not appropriate. Do not merge
Change-Id: I0066a3d0a2204cfc4beacb69aafccb35b9326bbb
Kenny Root [Mon, 4 Oct 2010 14:41:11 +0000 (07:41 -0700)]
am
b58b2714: Merge "ZipFileRO: moar logging and wrap close" into gingerbread
Merge commit '
b58b27142a936aa76897a7040c08b8a0989a685b' into gingerbread-plus-aosp
* commit '
b58b27142a936aa76897a7040c08b8a0989a685b':
ZipFileRO: moar logging and wrap close
Kenny Root [Mon, 4 Oct 2010 14:28:20 +0000 (07:28 -0700)]
Merge "ZipFileRO: moar logging and wrap close" into gingerbread
Hung-ying Tyan [Mon, 4 Oct 2010 05:45:49 +0000 (22:45 -0700)]
am
5cab38ba: Merge "SIP: minor fixes." into gingerbread
Merge commit '
5cab38ba11d976c54f28f4bdbced78040cba1cbb' into gingerbread-plus-aosp
* commit '
5cab38ba11d976c54f28f4bdbced78040cba1cbb':
SIP: minor fixes.
Hung-ying Tyan [Mon, 4 Oct 2010 05:43:28 +0000 (22:43 -0700)]
Merge "SIP: minor fixes." into gingerbread
Brad Fitzpatrick [Mon, 4 Oct 2010 04:13:51 +0000 (21:13 -0700)]
am
83d52229: Doc fix: duplicate word \'of\'
Merge commit '
83d522290e56f614d0d9373d47c2b54b9e207795' into gingerbread-plus-aosp
* commit '
83d522290e56f614d0d9373d47c2b54b9e207795':
Doc fix: duplicate word 'of'
Brad Fitzpatrick [Mon, 4 Oct 2010 04:07:21 +0000 (21:07 -0700)]
Doc fix: duplicate word 'of'
Change-Id: I45a4ca443becc2f2cf02cbca2bd61ef2ee590b5c
Hung-ying Tyan [Sun, 3 Oct 2010 12:35:02 +0000 (20:35 +0800)]
SIP: minor fixes.
+ Log error instead of crashing app process in SipManager's ListenerRelay.
+ Terminate dialog and transaction in SipSessionGroup.reset().
+ Remove redundant reset() in SipSessionGroup.
Change-Id: Ifbf29d2c9607ffe1a1a50b0c131ee3a4e81a0d0e
Mindy Pereira [Fri, 1 Oct 2010 23:37:06 +0000 (16:37 -0700)]
DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.
The issue here was originally that webview was showing twice
as intense of an effect for edge glow as lists. The root cause
was that abslistview was calling onPull half as often as webview. This
occurred because every time an action_move came into the touch handler
for abslistview when it was in overscroll, the mode was ALWAYS changed
back to scroll mode. Therefore, half the action_move events were
essentially being eating by the abslistview state machine.
After fixing that issue, needed to decrease the intensity of the effect
for webview and abslistview by halving the PULL_DISTANCE_GLOW_FACTOR.
Change-Id: I5dbdf4f1219f3bb157a71d4fccf8fa42e2abe047
Adam Powell [Sun, 3 Oct 2010 01:36:27 +0000 (18:36 -0700)]
am
624380a1: Fix bug
3047653 - Text select handles stick around when they shouldn\'t
Merge commit '
624380a14def6c2acdb473e09c36139acbcefbf9' into gingerbread-plus-aosp
* commit '
624380a14def6c2acdb473e09c36139acbcefbf9':
Fix bug
3047653 - Text select handles stick around when they shouldn't
Adam Powell [Sun, 3 Oct 2010 01:12:02 +0000 (18:12 -0700)]
Fix bug
3047653 - Text select handles stick around when they shouldn't
Text select handles will now fade out on their own after a few seconds
since many apps expect a selection to be persistent while a text field
stays focused in touch mode. The user may tap within the selection to
bring the anchors back.
Text select handles will also disappear upon leaving touch mode.
Fix a bug that impaired cut/paste from the context menu.
Change-Id: I8f431e2d261aec02581150125d11324a3ee11656
Adam Powell [Sun, 3 Oct 2010 00:49:07 +0000 (17:49 -0700)]
am
03876c90: Fix text anchor fade-out positioning
Merge commit '
03876c905f3874f3ac8deb5a23ee0f77d4c04bab' into gingerbread-plus-aosp
* commit '
03876c905f3874f3ac8deb5a23ee0f77d4c04bab':
Fix text anchor fade-out positioning
Adam Powell [Sun, 3 Oct 2010 00:28:29 +0000 (17:28 -0700)]
Fix text anchor fade-out positioning
Change-Id: I5660481fb883c28c88e384be2f26e67aa854ec8e
Adam Powell [Sat, 2 Oct 2010 23:59:42 +0000 (16:59 -0700)]
am
ea32f94e: Fix bug
3058082 - text anchor positioning within moving dialogs
Merge commit '
ea32f94ec4c14fe21b536139762c5332d1b5484c' into gingerbread-plus-aosp
* commit '
ea32f94ec4c14fe21b536139762c5332d1b5484c':
Fix bug
3058082 - text anchor positioning within moving dialogs
Adam Powell [Sat, 2 Oct 2010 23:03:45 +0000 (16:03 -0700)]
Fix bug
3058082 - text anchor positioning within moving dialogs
Change-Id: I8f0b515c73d2b3055b4072425418f837eb021d4f
Adam Powell [Sat, 2 Oct 2010 20:07:56 +0000 (13:07 -0700)]
am
8bcbebd4: Fix bug
3024080 - Date picker month field uses numeric text field
Merge commit '
8bcbebd4178b2e9aca9ee3bd9e1e12c42e74c8db' into gingerbread-plus-aosp
* commit '
8bcbebd4178b2e9aca9ee3bd9e1e12c42e74c8db':
Fix bug
3024080 - Date picker month field uses numeric text field
Adam Powell [Sat, 2 Oct 2010 19:16:51 +0000 (12:16 -0700)]
Fix bug
3024080 - Date picker month field uses numeric text field
NumberPicker now uses text entry when displayed value strings are
provided.
Change-Id: I555a7d6b64ad6a5af131b3e1d8c638dcdb00d02c
Jeff Brown [Sat, 2 Oct 2010 02:03:42 +0000 (19:03 -0700)]
am
e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread
Merge commit '
e951ef07dd8cb36ec0e127e80f5d558b8a2d6125' into gingerbread-plus-aosp
* commit '
e951ef07dd8cb36ec0e127e80f5d558b8a2d6125':
Wait for initial device scan to finish before updating config.
Jeff Brown [Sat, 2 Oct 2010 02:01:14 +0000 (19:01 -0700)]
am
f6295b35: Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread
Merge commit '
f6295b35db7a7c40d4fb1c981e231bebcf13e2ba' into gingerbread-plus-aosp
* commit '
f6295b35db7a7c40d4fb1c981e231bebcf13e2ba':
Minor logging changes to input dispatcher to help with debugging.
Jeff Brown [Sat, 2 Oct 2010 02:01:11 +0000 (19:01 -0700)]
Merge "Wait for initial device scan to finish before updating config." into gingerbread
Jeff Brown [Sat, 2 Oct 2010 01:58:32 +0000 (18:58 -0700)]
Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread
Jeff Brown [Sat, 2 Oct 2010 01:55:43 +0000 (18:55 -0700)]
Wait for initial device scan to finish before updating config.
This change narrows the opportunity for a race condition setting the
resource Configuration while devices are being updated.
Change-Id: I58efa563f4129ab0fce7108511d16a99dff7e451
Hung-ying Tyan [Sat, 2 Oct 2010 01:32:03 +0000 (18:32 -0700)]
am
306137d9: SIP telephony cleanup.
Merge commit '
306137d97f40a4f807c54a75210343c9262360d1' into gingerbread-plus-aosp
* commit '
306137d97f40a4f807c54a75210343c9262360d1':
SIP telephony cleanup.
Kenny Root [Sat, 2 Oct 2010 01:28:28 +0000 (18:28 -0700)]
ZipFileRO: moar logging and wrap close
There is apparently still a race upon reading the entry Local File
Header that can't be tracked down, so move the LFH check inside the
mutex-protected block so we can call lseek again to see where we are
when we log an error.
Also, close() can fail so use TEMP_FAILURE_RETRY on it so we don't
unwittingly leak file descriptors when Mean Mr. EINTR comes a-knocking.
Change-Id: I753abad0bd882fe28f7281c406fa76f64393ef4c
Jake Hamby [Sat, 2 Oct 2010 01:13:58 +0000 (18:13 -0700)]
am
7888486d: Merge "Add subaddress to SMS fingerprint calculation."
Merge commit '
7888486d1c930301535069bd90bb0bf3525b2bb5' into gingerbread-plus-aosp
* commit '
7888486d1c930301535069bd90bb0bf3525b2bb5':
Add subaddress to SMS fingerprint calculation.
Jeff Brown [Sat, 2 Oct 2010 00:46:21 +0000 (17:46 -0700)]
Minor logging changes to input dispatcher to help with debugging.
Added dumpsys reporting to EventHub.
Made the formatting a bit clearer.
Added 'Locked' suffix to some internal methods of EventHub.
Change-Id: Ic449560bcce378f6361895d27c66854e9724abb0
Jake Hamby [Sat, 2 Oct 2010 01:04:22 +0000 (18:04 -0700)]
Merge "Add subaddress to SMS fingerprint calculation."
James Dong [Sat, 2 Oct 2010 00:32:16 +0000 (17:32 -0700)]
am
6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread
Merge commit '
6c609b6a60e533a93c6d0088222bd8da209b9953' into gingerbread-plus-aosp
* commit '
6c609b6a60e533a93c6d0088222bd8da209b9953':
Turn off media time adjustment by default
Hung-ying Tyan [Fri, 1 Oct 2010 18:44:30 +0000 (02:44 +0800)]
SIP telephony cleanup.
+ Remove unused classes.
+ Remove unused imports.
+ Remove unused code.
+ add DEBUG flag.
Change-Id: Ie1236d909d971093b68b066d3d8c1857ac89f56f
James Dong [Sat, 2 Oct 2010 00:27:51 +0000 (17:27 -0700)]
Merge "Turn off media time adjustment by default" into gingerbread
James Dong [Sat, 2 Oct 2010 00:14:23 +0000 (17:14 -0700)]
Turn off media time adjustment by default
Change-Id: I1f8021d605d0fd896e0639607a84e3f7c459612e
Dianne Hackborn [Sat, 2 Oct 2010 00:02:18 +0000 (17:02 -0700)]
am
14e7d693: Merge "Some documentation fixes." into gingerbread
Merge commit '
14e7d693415832a974abc298124a6a5797d49a04' into gingerbread-plus-aosp
* commit '
14e7d693415832a974abc298124a6a5797d49a04':
Some documentation fixes.
Dianne Hackborn [Fri, 1 Oct 2010 23:46:29 +0000 (16:46 -0700)]
Merge "Some documentation fixes." into gingerbread
Jeff Brown [Fri, 1 Oct 2010 23:16:23 +0000 (16:16 -0700)]
am
9e32a438: Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread
Merge commit '
9e32a438fd87180692da55197972ecddb1a731d9' into gingerbread-plus-aosp
* commit '
9e32a438fd87180692da55197972ecddb1a731d9':
Support haptic feedback for virtual keys defined in key layout.
Chia-chi Yeh [Fri, 1 Oct 2010 23:16:17 +0000 (16:16 -0700)]
am
9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into gingerbread
Merge commit '
9430f9d37ec169ce0654bc8950adb66ac974b761' into gingerbread-plus-aosp
* commit '
9430f9d37ec169ce0654bc8950adb66ac974b761':
KeyStore: Update the parameters of generating master keys.
Jeff Brown [Fri, 1 Oct 2010 23:09:58 +0000 (16:09 -0700)]
Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread
Jake Hamby [Fri, 1 Oct 2010 23:02:16 +0000 (16:02 -0700)]
am
d531c9eb: Merge "Do not explicity disconnect Data during power down for 1x."
Merge commit '
d531c9ebe18f0b554d29d3c3b8e4a00f84dae97a' into gingerbread-plus-aosp
* commit '
d531c9ebe18f0b554d29d3c3b8e4a00f84dae97a':
Do not explicity disconnect Data during power down for 1x.
Scott Main [Fri, 1 Oct 2010 22:56:08 +0000 (15:56 -0700)]
am
91b0bc2a: am
32441bbe: docs: device dashboard update for 10/1
Merge commit '
91b0bc2a282f63f0ee532b5748c210bb67ba6fb3' into gingerbread-plus-aosp
* commit '
91b0bc2a282f63f0ee532b5748c210bb67ba6fb3':
docs: device dashboard update for 10/1
Hung-ying Tyan [Fri, 1 Oct 2010 22:56:02 +0000 (15:56 -0700)]
am
10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
Merge commit '
10e2120bdd2d99e100db187d49ac6a8495c7f956' into gingerbread-plus-aosp
* commit '
10e2120bdd2d99e100db187d49ac6a8495c7f956':
Add CallManager/Phone.setEchoSuppressionEnabled().
Adam Powell [Fri, 1 Oct 2010 22:55:44 +0000 (15:55 -0700)]
am
98f31087: Merge "DO NOT MERGE Fix bug
3026771, other design/asset fixes." into gingerbread
Merge commit '
98f310879790a98c4c24cd06677e08bf49f1cea0' into gingerbread-plus-aosp
* commit '
98f310879790a98c4c24cd06677e08bf49f1cea0':
DO NOT MERGE Fix bug
3026771, other design/asset fixes.
Chia-chi Yeh [Fri, 1 Oct 2010 22:34:43 +0000 (15:34 -0700)]
Merge "KeyStore: Update the parameters of generating master keys." into gingerbread
Kenny Root [Fri, 1 Oct 2010 22:11:22 +0000 (15:11 -0700)]
am
d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread
Merge commit '
d9e88d22f0ffefdc6a3b9c59168bd1bb6d402486' into gingerbread-plus-aosp
* commit '
d9e88d22f0ffefdc6a3b9c59168bd1bb6d402486':
Add "none" for vold and deprecate mkobb -c
Scott Main [Fri, 1 Oct 2010 22:11:10 +0000 (15:11 -0700)]
am
32441bbe: docs: device dashboard update for 10/1
Merge commit '
32441bbe61e2f02f09a319c00895aef8cfc27ff4' into gingerbread
* commit '
32441bbe61e2f02f09a319c00895aef8cfc27ff4':
docs: device dashboard update for 10/1
Jeff Brown [Fri, 1 Oct 2010 21:55:30 +0000 (14:55 -0700)]
Support haptic feedback for virtual keys defined in key layout.
Change-Id: I83e4108a87332692e03791dc066206becbc7941f
Jake Hamby [Fri, 1 Oct 2010 22:02:32 +0000 (15:02 -0700)]
Merge "Do not explicity disconnect Data during power down for 1x."
Hung-ying Tyan [Fri, 1 Oct 2010 21:52:00 +0000 (14:52 -0700)]
Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
Adam Powell [Fri, 1 Oct 2010 21:46:40 +0000 (14:46 -0700)]
Merge "DO NOT MERGE Fix bug
3026771, other design/asset fixes." into gingerbread
Adam Powell [Fri, 1 Oct 2010 21:04:34 +0000 (14:04 -0700)]
DO NOT MERGE Fix bug
3026771, other design/asset fixes.
* Button text changed to bold by default.
* Change notification divider to lighter gray (new asset).
* Change "Clear" notification button to use system small button assets.
Change-Id: Id1f1bdcf8c034186ad9acbdbdd544546bd32bbd8
Dianne Hackborn [Fri, 1 Oct 2010 21:21:32 +0000 (14:21 -0700)]
Dianne Hackborn [Fri, 1 Oct 2010 20:41:04 +0000 (13:41 -0700)]
Some documentation fixes.
Change-Id: Iaae452fc1430af788ce440a043ca7fb53e667a61
Kenny Root [Fri, 1 Oct 2010 21:06:46 +0000 (14:06 -0700)]
Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread
Dianne Hackborn [Fri, 1 Oct 2010 21:04:27 +0000 (14:04 -0700)]
Fix build.
Change-Id: I99d362e6673252ade4da29f29852eccaedbc9709
Kenny Root [Fri, 1 Oct 2010 19:56:59 +0000 (12:56 -0700)]
Add "none" for vold and deprecate mkobb -c
If vold isn't told "none" for the key, it will try to mount it as an
encrypted container.
Also remove the -c option from mkobb since it can be triggered by
including a key as well.
Change-Id: I40a8ff3f778bfda682312630e6687ecc14b51844
Dianne Hackborn [Fri, 1 Oct 2010 20:42:40 +0000 (13:42 -0700)]
am
1fa69735: Merge "Fix issue #
3037083: Problem report for Pinball" into gingerbread
Merge commit '
1fa69735d9e786da4b20c3ab3da3aa66f3cf8116' into gingerbread-plus-aosp
* commit '
1fa69735d9e786da4b20c3ab3da3aa66f3cf8116':
Fix issue #
3037083: Problem report for Pinball
Dianne Hackborn [Fri, 1 Oct 2010 20:39:39 +0000 (13:39 -0700)]
Merge "Fix issue #
3037083: Problem report for Pinball" into gingerbread
Steve Howard [Fri, 1 Oct 2010 20:16:17 +0000 (13:16 -0700)]
am
751b4731: Merge "A few additions to the download manager public API documentation" into gingerbread
Merge commit '
751b47313886264e1229ab67184c9771424be402' into gingerbread-plus-aosp
* commit '
751b47313886264e1229ab67184c9771424be402':
A few additions to the download manager public API documentation
Steve Howard [Fri, 1 Oct 2010 20:12:39 +0000 (13:12 -0700)]
Merge "A few additions to the download manager public API documentation" into gingerbread
Dianne Hackborn [Fri, 1 Oct 2010 20:06:30 +0000 (13:06 -0700)]
Fix issue #
3037083: Problem report for Pinball
The app was toggling between hiding and showing the status bar, because
the dialog was large enough to fill the screen but didn't set to hide
the status bar.
It turns out that the code to determine the top fullscreen window is
intrinsically unstable, since it relies on comparing a window's frame
with the screen, yet the window frame can change as a result of changes
such as hiding the status bar.
Instead, we now simplify all of this to just say that the top fillxfill
window gets to control the status bar.
Change-Id: I22913adf7235fe0d52612f6738c7c94351274e38
Brad Fitzpatrick [Fri, 1 Oct 2010 20:05:02 +0000 (13:05 -0700)]
am
32e60c79: Update StrictMode\'s public API.
Merge commit '
32e60c7942eeba920ec5c27b372ec0899fd75a20' into gingerbread-plus-aosp
* commit '
32e60c7942eeba920ec5c27b372ec0899fd75a20':
Update StrictMode's public API.
Brad Fitzpatrick [Thu, 30 Sep 2010 23:22:36 +0000 (16:22 -0700)]
Update StrictMode's public API.
This makes it more future-proof and maintainable, not exposing the
internal bitpacking state.
The implementation is unchanged (the policy is still just an int we pass
around).
Also starts to introduce VmPolicy, for things which are process-wide,
not per-thread. As an initial user, make SQLite's Cursor finalization
leak warnings use StrictMode.
Change-Id: Idedfba4e965716f5089a52036421460b1f383725
Wei-Ta Chen [Fri, 1 Oct 2010 19:36:05 +0000 (12:36 -0700)]
am
f7681f84: Do not merge.
Merge commit '
f7681f84918c27f6a626681ce37ed2a236c44e82' into gingerbread-plus-aosp
* commit '
f7681f84918c27f6a626681ce37ed2a236c44e82':
Do not merge.
Wei-Ta Chen [Thu, 30 Sep 2010 23:31:38 +0000 (16:31 -0700)]
Do not merge.
Fix
3052285 by not publishing the BitmapRegionDecoder API until the honeycomb release.
Bug:
3052285
Change-Id: Ie339e414c1a5581e1d38684621e0e97162616977
Andreas Huber [Fri, 1 Oct 2010 18:37:44 +0000 (11:37 -0700)]
am
e619a9da: Merge "Start playing live streams from the start, no the middle..." into gingerbread
Merge commit '
e619a9da44e4c00f9034917aef67f86da0bc207f' into gingerbread-plus-aosp
* commit '
e619a9da44e4c00f9034917aef67f86da0bc207f':
Start playing live streams from the start, no the middle...
Andreas Huber [Fri, 1 Oct 2010 18:35:17 +0000 (11:35 -0700)]
Merge "Start playing live streams from the start, no the middle..." into gingerbread
Fabrice Di Meglio [Fri, 1 Oct 2010 18:32:56 +0000 (11:32 -0700)]
am
73db5f02: Merge "Fix bug #
3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread
Merge commit '
73db5f02a1e1a3fc3514ddbff1c28e22fec3aa7a' into gingerbread-plus-aosp
* commit '
73db5f02a1e1a3fc3514ddbff1c28e22fec3aa7a':
Fix bug #
3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)
Scott Main [Fri, 1 Oct 2010 18:31:57 +0000 (11:31 -0700)]
docs: device dashboard update for 10/1
Change-Id: Ic2f712aed325f04cc94d137d42dc16a2e5845f75
Fabrice Di Meglio [Fri, 1 Oct 2010 18:30:50 +0000 (11:30 -0700)]
Merge "Fix bug #
3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread
Andreas Huber [Fri, 1 Oct 2010 18:28:44 +0000 (11:28 -0700)]
Start playing live streams from the start, no the middle...
Change-Id: Ie01ba1250b51155cb1fb32fc3340189a16c01476
related-to-bug:
2368598
Andreas Huber [Fri, 1 Oct 2010 18:25:57 +0000 (11:25 -0700)]
am
469b8033: Merge "Remove development-only code." into gingerbread
Merge commit '
469b80336368bef3742e97c15e9017c1f2d404ae' into gingerbread-plus-aosp
* commit '
469b80336368bef3742e97c15e9017c1f2d404ae':
Remove development-only code.
Andreas Huber [Fri, 1 Oct 2010 18:23:24 +0000 (11:23 -0700)]
Merge "Remove development-only code." into gingerbread
Andreas Huber [Fri, 1 Oct 2010 18:19:26 +0000 (11:19 -0700)]
Remove development-only code.
Change-Id: Ic2ca0efb631eb779ca157fb01b02aa19a1222c06
related-to-bug:
2368598
Fabrice Di Meglio [Fri, 1 Oct 2010 18:16:10 +0000 (11:16 -0700)]
Fix bug #
3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)
- fix NPE
- code cleaning
Change-Id: Ieb30b666d995de8cbd27ee6d17e2178e7ea670f6
Erik [Fri, 1 Oct 2010 18:10:59 +0000 (11:10 -0700)]
am
57bd0615: Merge "b/
3054044 Make allDay event times format in utc" into gingerbread
Merge commit '
57bd0615fa48124c4607fbb1ba09a7c7160be146' into gingerbread-plus-aosp
* commit '
57bd0615fa48124c4607fbb1ba09a7c7160be146':
b/
3054044 Make allDay event times format in utc
Erik [Fri, 1 Oct 2010 18:08:13 +0000 (11:08 -0700)]
Merge "b/
3054044 Make allDay event times format in utc" into gingerbread
Andreas Huber [Fri, 1 Oct 2010 18:03:47 +0000 (11:03 -0700)]
am
d1398db3: Merge "Squashed commit of the following:" into gingerbread
Merge commit '
d1398db35cb2e4d918fc631dda35cacb8540b187' into gingerbread-plus-aosp
* commit '
d1398db35cb2e4d918fc631dda35cacb8540b187':
Squashed commit of the following:
Andreas Huber [Fri, 1 Oct 2010 18:01:33 +0000 (11:01 -0700)]
Merge "Squashed commit of the following:" into gingerbread
Erik [Fri, 1 Oct 2010 18:01:01 +0000 (11:01 -0700)]
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
Andreas Huber [Fri, 1 Oct 2010 17:51:41 +0000 (10:51 -0700)]
Squashed commit of the following:
commit
46744c7697f29aec71aed8de3c95ce035c284d97
Author: Andreas Huber <andih@google.com>
Date: Thu Sep 30 16:44:57 2010 -0700
better separation of access units
Change-Id: I5a9e2138aed341f0bcf22cfe368a15ca5ea5a73c
commit
d34952ac0feb1ae722ff65824d7353335502219b
Author: Andreas Huber <andih@google.com>
Date: Thu Sep 30 15:35:01 2010 -0700
Support for ES packets that do not start on PES packet boundaries.
Change-Id: I2cf012833948eddfb20b16a1901206cf22ce71e4
related-to-bug:
2368598
Change-Id: Ib9329bd6bb7149b5a6e2483788a96b1b158952fc
Kenny Root [Fri, 1 Oct 2010 15:55:53 +0000 (08:55 -0700)]
am
29423918: Fix regression in OBB key handling
Merge commit '
2942391801b79816c5eb77d7ac94c4a65f26af48' into gingerbread-plus-aosp
* commit '
2942391801b79816c5eb77d7ac94c4a65f26af48':
Fix regression in OBB key handling
Kenny Root [Fri, 1 Oct 2010 15:37:20 +0000 (08:37 -0700)]
Fix regression in OBB key handling
Change-Id: If583cbdb8be68ffed094a5fde7ee00e1914c5841
Dianne Hackborn [Fri, 1 Oct 2010 02:12:11 +0000 (19:12 -0700)]
am
0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread
Merge commit '
0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp
* commit '
0a69f597604254bc37721b135ab612eaacdd0cbd':
Rub in a little 'ol log-b-gone.
Dianne Hackborn [Fri, 1 Oct 2010 02:03:38 +0000 (19:03 -0700)]
Merge "Rub in a little 'ol log-b-gone." into gingerbread
Steve Howard [Fri, 1 Oct 2010 01:30:04 +0000 (18:30 -0700)]
A few additions to the download manager public API documentation
Change-Id: Icf831843e281d8eee9c1457273662121bb5a8609
Dianne Hackborn [Fri, 1 Oct 2010 01:27:22 +0000 (18:27 -0700)]
Rub in a little 'ol log-b-gone.
Mmmmmm... great fresh scent!
Change-Id: I050e70b31b5d4a9c6731f15a4b51a3620a33a78d
Joe Onorato [Fri, 1 Oct 2010 01:19:09 +0000 (18:19 -0700)]
am
ab2e6284: Merge "Use the private version of userActivity." into gingerbread
Merge commit '
ab2e6284845794079d809e62c52c6c380b31c4b5' into gingerbread-plus-aosp
* commit '
ab2e6284845794079d809e62c52c6c380b31c4b5':
Use the private version of userActivity.
Joe Onorato [Fri, 1 Oct 2010 01:12:24 +0000 (18:12 -0700)]
Merge "Use the private version of userActivity." into gingerbread
Kenny Root [Fri, 1 Oct 2010 01:06:02 +0000 (18:06 -0700)]
am
8b28441a: Merge "Being already unmounted is not a failure" into gingerbread
Merge commit '
8b28441adab59f2bb0d92c8a717af75331249e08' into gingerbread-plus-aosp
* commit '
8b28441adab59f2bb0d92c8a717af75331249e08':
Being already unmounted is not a failure
Kenny Root [Fri, 1 Oct 2010 01:03:25 +0000 (18:03 -0700)]
Merge "Being already unmounted is not a failure" into gingerbread
Chia-chi Yeh [Fri, 1 Oct 2010 01:02:38 +0000 (18:02 -0700)]
am
274e3b5d: Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread
Merge commit '
274e3b5d752d1a4fd05352e50ad098d2f5b49a36' into gingerbread-plus-aosp
* commit '
274e3b5d752d1a4fd05352e50ad098d2f5b49a36':
RTP: Start AudioRecord before AudioTrack to avoid being disabled.
Kenny Root [Fri, 1 Oct 2010 00:58:41 +0000 (17:58 -0700)]
Being already unmounted is not a failure
Change-Id: I5943096444e3d4d4cc5fd63f64a09c32f649a227