OSDN Git Service
Wink Saville [Thu, 5 May 2011 23:24:58 +0000 (16:24 -0700)]
am
3bebae43: am
d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE
* commit '
3bebae4332144004db9f774bfde1abcd6c656b2c':
Add Delay for data connection retry.
Wink Saville [Thu, 5 May 2011 23:24:55 +0000 (16:24 -0700)]
am
0b45723f: am
8bc60413: Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE
* commit '
0b45723f80ecb6038b15d791650d46f60f70f45f':
DataConnection: Fix handling of PDP setup failure.
Wink Saville [Thu, 5 May 2011 23:22:31 +0000 (16:22 -0700)]
am
d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE
* commit '
d237d05c6f36d4e514eac95a9bcc07106c3d97eb':
Add Delay for data connection retry.
Wink Saville [Thu, 5 May 2011 23:22:29 +0000 (16:22 -0700)]
am
8bc60413: Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE
* commit '
8bc60413b9840c7fa724e52f1271936640e97736':
DataConnection: Fix handling of PDP setup failure.
Wink Saville [Thu, 5 May 2011 23:20:11 +0000 (16:20 -0700)]
Merge "Add Delay for data connection retry." into honeycomb-LTE
Wink Saville [Thu, 5 May 2011 23:20:02 +0000 (16:20 -0700)]
Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE
Bill Gruber [Thu, 5 May 2011 23:13:03 +0000 (16:13 -0700)]
am
821ec8ed: am
48f472f7: am
0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
* commit '
821ec8edeee7d59396cbee3a370e5cf3d6c7b8b6':
Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
Bill Gruber [Thu, 5 May 2011 23:09:42 +0000 (16:09 -0700)]
am
48f472f7: am
0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
* commit '
48f472f748e9404bdb93a93f20a530794f6cdc2f':
Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
Bill Gruber [Thu, 5 May 2011 23:05:41 +0000 (16:05 -0700)]
am
0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
* commit '
0369cf98743e72d052eb5542125f58d1ad2f7f61':
Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
Andreas Huber [Thu, 5 May 2011 22:51:25 +0000 (15:51 -0700)]
Merge "Color conversion now supports YUV420p->RGB565 conversion even if the width is odd."
Scott Main [Thu, 5 May 2011 22:27:30 +0000 (15:27 -0700)]
am
cda9fda4: am
4c8fa6d1: am
1c71fffe: update platform version number for docs
* commit '
cda9fda4fdeac3c3ce24df27e1c24c72d5b70960':
update platform version number for docs
James Dong [Thu, 5 May 2011 22:24:45 +0000 (15:24 -0700)]
Merge "Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI"
Scott Main [Thu, 5 May 2011 22:24:12 +0000 (15:24 -0700)]
am
4c8fa6d1: am
1c71fffe: update platform version number for docs
* commit '
4c8fa6d13500a7921601e098b47e2eb34aa18024':
update platform version number for docs
Scott Main [Thu, 5 May 2011 22:18:19 +0000 (15:18 -0700)]
am
1c71fffe: update platform version number for docs
* commit '
1c71fffeb5d6a241ccbe7f035ce0d030eaeef562':
update platform version number for docs
Patrick Dubroy [Thu, 5 May 2011 21:59:35 +0000 (14:59 -0700)]
Merge "Only delay pressed feedback for Views inside a scrolling parent"
James Dong [Thu, 5 May 2011 19:49:37 +0000 (12:49 -0700)]
Merge "Clean up JNI code"
Gilles Debunne [Thu, 5 May 2011 17:08:59 +0000 (10:08 -0700)]
Merge "Off by one bug in TextView's suggestions popup."
Alex Sakhartchouk [Thu, 5 May 2011 16:38:00 +0000 (09:38 -0700)]
Merge "Code Cleanup and better Sampler creation method"
Alex Sakhartchouk [Thu, 5 May 2011 16:37:07 +0000 (09:37 -0700)]
Merge "save benchmark results"
Scott Main [Thu, 5 May 2011 16:02:35 +0000 (09:02 -0700)]
am
4f034f70: am
475917c7: am
e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
* commit '
4f034f70d473c8c737977898f18d54caccf99a17':
docs: update homepage to announce 3.1
Scott Main [Thu, 5 May 2011 15:54:07 +0000 (08:54 -0700)]
am
475917c7: am
e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
* commit '
475917c7e4002c42cdf668eabc1a04f604a82005':
docs: update homepage to announce 3.1
Scott Main [Thu, 5 May 2011 15:43:42 +0000 (08:43 -0700)]
am
e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
* commit '
e6746acde2a0cc4faad9bdec026a9554797e2f94':
docs: update homepage to announce 3.1
Scott Main [Thu, 5 May 2011 15:33:03 +0000 (08:33 -0700)]
Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
Steve Block [Thu, 5 May 2011 11:36:27 +0000 (04:36 -0700)]
Merge "Log an error message if WebView methods are called on the wrong thread."
Irfan Sheriff [Thu, 5 May 2011 04:22:29 +0000 (21:22 -0700)]
am
86654eda: am
8a14d8b9: am
1a5b6098: Handle GET_POWER failures
* commit '
86654eda96b005ea21bfe4d29cd042187e497a8f':
Handle GET_POWER failures
Irfan Sheriff [Thu, 5 May 2011 04:19:19 +0000 (21:19 -0700)]
am
8a14d8b9: am
1a5b6098: Handle GET_POWER failures
* commit '
8a14d8b9c03c611cabde5743cfdcc9ff51314550':
Handle GET_POWER failures
Irfan Sheriff [Thu, 5 May 2011 04:14:47 +0000 (21:14 -0700)]
am
1a5b6098: Handle GET_POWER failures
* commit '
1a5b6098d5002ae07ce3f9bc514400a87c2b64fa':
Handle GET_POWER failures
Joe Onorato [Thu, 5 May 2011 01:13:10 +0000 (18:13 -0700)]
Merge "Fix race conditions in WakeLocks."
Irfan Sheriff [Thu, 5 May 2011 00:58:04 +0000 (17:58 -0700)]
Merge "Add basic walled garden check"
Jeff Sharkey [Thu, 5 May 2011 00:49:01 +0000 (17:49 -0700)]
Merge "Return NetworkStats bundle from NM service."
Chet Haase [Thu, 5 May 2011 00:30:30 +0000 (17:30 -0700)]
Merge "Add ability for hierarchyviewer to output displaylist info"
Wink Saville [Thu, 5 May 2011 00:06:46 +0000 (17:06 -0700)]
am
ece6eb56: am
676db0d3: Merge "Fix
4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE
* commit '
ece6eb5625ac8b597f60d67f30f431ea13f237a5':
Fix
4379712 NPE in GsmDataConnectionTracker
Robert Ly [Thu, 5 May 2011 00:04:50 +0000 (17:04 -0700)]
am
796ba68b: am
2246bc66: am
7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
* commit '
796ba68b73fa93ae290cf85b264183ffcfa45eba':
doc change: a misplaced link removed
Wink Saville [Thu, 5 May 2011 00:04:19 +0000 (17:04 -0700)]
am
676db0d3: Merge "Fix
4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE
* commit '
676db0d301caf4fa64c2c1b8427fe2efd5cc7811':
Fix
4379712 NPE in GsmDataConnectionTracker
Robert Ly [Thu, 5 May 2011 00:02:26 +0000 (17:02 -0700)]
am
2246bc66: am
7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
* commit '
2246bc665d09e8f8e1dc35702fbe76e8bb270d56':
doc change: a misplaced link removed
Wink Saville [Thu, 5 May 2011 00:01:32 +0000 (17:01 -0700)]
Merge "Fix
4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE
Robert Ly [Thu, 5 May 2011 00:00:10 +0000 (17:00 -0700)]
am
7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
* commit '
7157b7c31462e9340847d15d936bbb0b1117ecbb':
doc change: a misplaced link removed
Robert Greenwalt [Wed, 4 May 2011 23:59:47 +0000 (16:59 -0700)]
am
5673c13b: am
aacd80fd: Fix build break.
* commit '
5673c13b51bc4719d9a1afceb1aeb4743e86e230':
Fix build break.
Robert Ly [Wed, 4 May 2011 23:55:59 +0000 (16:55 -0700)]
Merge "doc change: a misplaced link removed" into honeycomb-mr1
Robert Greenwalt [Wed, 4 May 2011 23:55:26 +0000 (16:55 -0700)]
am
aacd80fd: Fix build break.
* commit '
aacd80fd87bc08c410853a044967c8f7b417f089':
Fix build break.
Katie McCormick [Wed, 4 May 2011 22:51:53 +0000 (15:51 -0700)]
am
cfb91777: am
7d513652: am
62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
* commit '
cfb917770a063174dc188c28200d31c206e0bbfc':
Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
Katie McCormick [Wed, 4 May 2011 22:49:17 +0000 (15:49 -0700)]
am
7d513652: am
62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
* commit '
7d513652380ec4e1760e1f253d3630e4fdeb0ee5':
Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
Katie McCormick [Wed, 4 May 2011 22:47:10 +0000 (15:47 -0700)]
am
62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
* commit '
62922c361e0c1b36c3787d7f06d04c3a609c2b12':
Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
Joe Onorato [Wed, 4 May 2011 22:29:15 +0000 (15:29 -0700)]
Merge "If there is no hdmi available, still record that hdmi is not plugged in."
Scott Main [Wed, 4 May 2011 22:23:31 +0000 (15:23 -0700)]
am
bcac77ec: am
f9e9452c: am
ad3b87aa: cherrypick from honeycomb cl
742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
* commit '
bcac77ec5c86dda8bacf3ab7c2c5a5597bf6cbd2':
cherrypick from honeycomb cl
742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
Scott Main [Wed, 4 May 2011 22:20:03 +0000 (15:20 -0700)]
am
f9e9452c: am
ad3b87aa: cherrypick from honeycomb cl
742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
* commit '
f9e9452c2d6482a8181f6edb32f5c53bff10aa59':
cherrypick from honeycomb cl
742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
Scott Main [Wed, 4 May 2011 22:09:53 +0000 (15:09 -0700)]
am
ad3b87aa: cherrypick from honeycomb cl
742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
* commit '
ad3b87aa0d094c3e867ce44ec3f61e0b02090417':
cherrypick from honeycomb cl
742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
Joe Onorato [Wed, 4 May 2011 21:52:37 +0000 (14:52 -0700)]
Merge "Rename ViewRoot to ViewAncestor."
Scott Main [Wed, 4 May 2011 21:48:10 +0000 (14:48 -0700)]
am
e9091efe: am
bb4ffd45: am
41703766: docs: typo in menu doc
* commit '
e9091efe44f75795fdbad46ef9393d886de806d9':
docs: typo in menu doc
Scott Main [Wed, 4 May 2011 21:44:23 +0000 (14:44 -0700)]
am
bb4ffd45: am
41703766: docs: typo in menu doc
* commit '
bb4ffd45c833a59882706bd53fde3b04bf4dc441':
docs: typo in menu doc
Scott Main [Wed, 4 May 2011 21:41:45 +0000 (14:41 -0700)]
Scott Main [Wed, 4 May 2011 21:41:35 +0000 (14:41 -0700)]
am
41703766: docs: typo in menu doc
* commit '
41703766815918c96fa0f45c6f27a29a0865846a':
docs: typo in menu doc
Scott Main [Wed, 4 May 2011 21:38:50 +0000 (14:38 -0700)]
Scott Main [Wed, 4 May 2011 21:37:10 +0000 (14:37 -0700)]
James Dong [Wed, 4 May 2011 20:56:36 +0000 (13:56 -0700)]
Merge "Initial check-in for AACWriter"
Robert Ly [Wed, 4 May 2011 20:20:11 +0000 (13:20 -0700)]
am
232ea51c: am
7c8be3a7: am
762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1
* commit '
232ea51c9c1af7a56e2315de863d65382c7c9a67':
adding the usb apis to the resources browser
Andreas Huber [Wed, 4 May 2011 20:18:36 +0000 (13:18 -0700)]
Merge "Signal an error if aac decoding fails early."
Robert Ly [Wed, 4 May 2011 20:17:37 +0000 (13:17 -0700)]
am
7c8be3a7: am
762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1
* commit '
7c8be3a75d541652a4eca9ad2433af90232b2af5':
adding the usb apis to the resources browser
Robert Ly [Wed, 4 May 2011 20:14:48 +0000 (13:14 -0700)]
am
762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1
* commit '
762481f0b58ac41b7583f74315fcb213ca0eb630':
adding the usb apis to the resources browser
Robert Ly [Wed, 4 May 2011 20:10:54 +0000 (13:10 -0700)]
Merge "adding the usb apis to the resources browser" into honeycomb-mr1
Jason Sams [Wed, 4 May 2011 19:59:50 +0000 (12:59 -0700)]
Merge "Fix error checks on compute context creation. Remove GL init for compute scripts."
Robert Ly [Wed, 4 May 2011 19:47:58 +0000 (12:47 -0700)]
am
4c8112f2: am
f0a1d683: am
fd7974f5: Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1
* commit '
4c8112f2f8f87a9d20195b133352604352049dbd':
Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL
Dan Morrill [Wed, 4 May 2011 19:47:51 +0000 (12:47 -0700)]
am
6d36190a: (-s ours) am
dacce73b: (-s ours) am
4ec33c2a: Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
* commit '
6d36190a7379ec1783c6eb5a27c946118dd53648':
Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
Robert Greenwalt [Wed, 4 May 2011 19:47:30 +0000 (12:47 -0700)]
am
9c7e6fc5: am
f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
* commit '
9c7e6fc50614cc1739d4bfbf6187893c27b01a67':
Add auto-restore timeout for secondary networks.
Mike Lockwood [Wed, 4 May 2011 19:47:21 +0000 (12:47 -0700)]
am
63de615d: (-s ours) am
36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
* commit '
63de615ddb3cb81bbb5b548693faca971d182a6d':
DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
Mike Lockwood [Wed, 4 May 2011 19:47:18 +0000 (12:47 -0700)]
am
0faefb72: (-s ours) am
8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
* commit '
0faefb72fb8917c9408f7b71c2bac5a9d5f264c2':
DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
Mike Lockwood [Wed, 4 May 2011 19:47:14 +0000 (12:47 -0700)]
am
df889448: (-s ours) am
a792c804: DO NOT MERGE MTP: Implement GetThumb command
* commit '
df8894486c246a8c4e47cc2b3547e9c173225f34':
DO NOT MERGE MTP: Implement GetThumb command
Mike Lockwood [Wed, 4 May 2011 19:47:10 +0000 (12:47 -0700)]
am
af964a63: (-s ours) am
af50821b: DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
* commit '
af964a632dafed7d56d1faf0427b9b9056346e20':
DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
Mike Lockwood [Wed, 4 May 2011 19:47:06 +0000 (12:47 -0700)]
am
eeaf48ca: (-s ours) am
fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place editing of files
* commit '
eeaf48ca8572b2fcb3fe05a22eb6759027924197':
DO NOT MERGE MTP: Add extended operations to support in-place editing of files
Mike Lockwood [Wed, 4 May 2011 19:47:02 +0000 (12:47 -0700)]
am
f6df5b41: (-s ours) am
fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
* commit '
f6df5b41e145ee996ca4f94bec014ab3e41f0b21':
DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
Marco Nelissen [Wed, 4 May 2011 19:46:57 +0000 (12:46 -0700)]
am
863ee409: (-s ours) am
7dd59229: DO NOT MERGE Fix media scanner uri handling.
* commit '
863ee40964ef2a017a1116abe37c6b8ad466dd5e':
DO NOT MERGE Fix media scanner uri handling.
Mike Lockwood [Wed, 4 May 2011 19:46:52 +0000 (12:46 -0700)]
am
4397c324: (-s ours) am
c535f7f2: DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
* commit '
4397c3240240080cf17a1cd4dcaff87ab7cacb3a':
DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
Mike Lockwood [Wed, 4 May 2011 19:46:47 +0000 (12:46 -0700)]
am
21c0800f: (-s ours) am
d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices:
* commit '
21c0800f71c75d7bc38ca6dbc69fd8d10f175dcb':
DO NOT MERGE MTP and media provider support for multiple storage devices:
Mike Lockwood [Wed, 4 May 2011 19:46:42 +0000 (12:46 -0700)]
am
20c35612: (-s ours) am
10fbba21: DO NOT MERGE MountService: Fix running media scanner at boot.
* commit '
20c356128492cf43d9ca10308601be585514f165':
DO NOT MERGE MountService: Fix running media scanner at boot.
Mike Lockwood [Wed, 4 May 2011 19:46:36 +0000 (12:46 -0700)]
am
2572051c: (-s ours) am
0aa5d7b7: DO NOT MERGE Fix deadlock in MountService
* commit '
2572051c4f6589e5ca8b21158a24a7fa606a5e67':
DO NOT MERGE Fix deadlock in MountService
Mike Lockwood [Wed, 4 May 2011 19:46:31 +0000 (12:46 -0700)]
am
a2a8419d: (-s ours) am
e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
* commit '
a2a8419db82ae40146bdfd215e3de3be39c7249c':
DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
Mike Lockwood [Wed, 4 May 2011 19:46:21 +0000 (12:46 -0700)]
am
60c768d4: (-s ours) am
346a2d79: DO NOT MERGE MountService: Add support for multiple volumes
* commit '
60c768d41277e3b7d4988452e15694c7ad5a74d0':
DO NOT MERGE MountService: Add support for multiple volumes
Daniel Sandler [Wed, 4 May 2011 19:36:35 +0000 (12:36 -0700)]
Merge "New art. FPO, of course."
Robert Ly [Wed, 4 May 2011 19:33:54 +0000 (12:33 -0700)]
am
f0a1d683: am
fd7974f5: Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1
* commit '
f0a1d683d9c45a2d5e8e22edaf991b1f9c5b4402':
Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL
Robert Ly [Wed, 4 May 2011 19:27:39 +0000 (12:27 -0700)]
am
fd7974f5: Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1
* commit '
fd7974f531b8784e7d229d31dda228cca0e7c2d8':
Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL
Robert Ly [Wed, 4 May 2011 19:18:09 +0000 (12:18 -0700)]
Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1
Jeff Sharkey [Wed, 4 May 2011 18:58:55 +0000 (11:58 -0700)]
Merge "Avoid throwing when forceRefresh() missing server."
Andreas Huber [Wed, 4 May 2011 18:50:48 +0000 (11:50 -0700)]
Merge "Fix potential memory corruption in NuCachedSource2."
Daniel Sandler [Wed, 4 May 2011 18:26:38 +0000 (11:26 -0700)]
Merge "On-screen navigation bar (separate from the status bar)."
Dan Morrill [Wed, 4 May 2011 17:29:34 +0000 (10:29 -0700)]
am
dacce73b: (-s ours) am
4ec33c2a: Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
* commit '
dacce73bcc53a21125f532d8000e7ec2e3c30a35':
Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
Robert Greenwalt [Wed, 4 May 2011 17:02:16 +0000 (10:02 -0700)]
am
f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
* commit '
f13eb8301f4704179938e374129f2943c9c38d5f':
Add auto-restore timeout for secondary networks.
Robert Greenwalt [Wed, 4 May 2011 16:59:30 +0000 (09:59 -0700)]
Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
Daniel Sandler [Wed, 4 May 2011 16:00:18 +0000 (09:00 -0700)]
Merge "Start honeyphoning the notification panel."
Gloria Wang [Wed, 4 May 2011 16:00:15 +0000 (09:00 -0700)]
Merge "Initial CL for the timed text support: - Add support for MP4 timed text - Add API for app to turn on/off a text track - Add timed text metadata(language) in the MediaMetadataRetriever"
Mike Lockwood [Wed, 4 May 2011 15:57:59 +0000 (08:57 -0700)]
am
36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
* commit '
36132a488b2974db9a90da809c2f3eeab99a4427':
DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
Mike Lockwood [Wed, 4 May 2011 15:57:56 +0000 (08:57 -0700)]
am
8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
* commit '
8b1c74f96f93195326907db1bb07a3787a1c1b45':
DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
Mike Lockwood [Wed, 4 May 2011 15:57:47 +0000 (08:57 -0700)]
am
a792c804: DO NOT MERGE MTP: Implement GetThumb command
* commit '
a792c804025e25eb8a110d1db63f26bbd09e0e6b':
DO NOT MERGE MTP: Implement GetThumb command
Mike Lockwood [Wed, 4 May 2011 15:57:44 +0000 (08:57 -0700)]
am
af50821b: DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
* commit '
af50821bace87aa83c7faba7bf139cfcaccf317a':
DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
Mike Lockwood [Wed, 4 May 2011 15:57:41 +0000 (08:57 -0700)]
am
fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place editing of files
* commit '
fdb50e6f8eaac31010b64fc79a60dacb5f776613':
DO NOT MERGE MTP: Add extended operations to support in-place editing of files
Mike Lockwood [Wed, 4 May 2011 15:57:37 +0000 (08:57 -0700)]
am
fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
* commit '
fb6232635d339c83ca100e472b159f103dafb6e2':
DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
Marco Nelissen [Wed, 4 May 2011 15:57:33 +0000 (08:57 -0700)]
am
7dd59229: DO NOT MERGE Fix media scanner uri handling.
* commit '
7dd592298aefb7921afb86ced444d46cb30ac466':
DO NOT MERGE Fix media scanner uri handling.
Mike Lockwood [Wed, 4 May 2011 15:57:29 +0000 (08:57 -0700)]
am
c535f7f2: DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
* commit '
c535f7f291f0bda688efcee62f21cf44d0ebe38e':
DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
Mike Lockwood [Wed, 4 May 2011 15:57:23 +0000 (08:57 -0700)]
am
d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices:
* commit '
d3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa':
DO NOT MERGE MTP and media provider support for multiple storage devices:
Mike Lockwood [Wed, 4 May 2011 15:57:19 +0000 (08:57 -0700)]
am
10fbba21: DO NOT MERGE MountService: Fix running media scanner at boot.
* commit '
10fbba21e4827a1582d97aa99e4e8d772ce04920':
DO NOT MERGE MountService: Fix running media scanner at boot.
Mike Lockwood [Wed, 4 May 2011 15:57:12 +0000 (08:57 -0700)]
am
0aa5d7b7: DO NOT MERGE Fix deadlock in MountService
* commit '
0aa5d7b7f225236ac8461d0b6835b9c6152a2699':
DO NOT MERGE Fix deadlock in MountService
OSDN Git Service
