Scott Main
0bcc66c626
am 7017c942: docs: fix issue 4383086
...
* commit '7017c94249f7d27643fefd242e9faf9e53ce986e':
docs: fix issue 4383086
2011-05-04 14:37:10 -07:00
James Dong
9fe3c944ff
Merge "Initial check-in for AACWriter"
2011-05-04 13:56:36 -07:00
Robert Ly
90f1174cce
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
2011-05-04 13:20:11 -07:00
Andreas Huber
9b68628992
Merge "Signal an error if aac decoding fails early."
2011-05-04 13:18:36 -07:00
Robert Ly
5ce11636ee
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
2011-05-04 13:17:37 -07:00
Robert Ly
8d16a63941
am 762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1
...
* commit '762481f0b58ac41b7583f74315fcb213ca0eb630':
adding the usb apis to the resources browser
2011-05-04 13:14:48 -07:00
Robert Ly
9b1d182b5d
Merge "adding the usb apis to the resources browser" into honeycomb-mr1
2011-05-04 13:10:54 -07:00
Jason Sams
2c492bbe2d
Merge "Fix error checks on compute context creation. Remove GL init for compute scripts."
2011-05-04 12:59:50 -07:00
Robert Ly
de7123dd40
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
2011-05-04 12:47:58 -07:00
Dan Morrill
d501c80db5
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.
2011-05-04 12:47:51 -07:00
Robert Greenwalt
3b79136526
am 9c7e6fc5: am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
...
* commit '9c7e6fc50614cc1739d4bfbf6187893c27b01a67':
Add auto-restore timeout for secondary networks.
2011-05-04 12:47:30 -07:00
Mike Lockwood
3146d231cc
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()
2011-05-04 12:47:21 -07:00
Mike Lockwood
4fd1cf42b7
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
2011-05-04 12:47:18 -07:00
Mike Lockwood
233c6b3270
am df889448: (-s ours) am a792c804: DO NOT MERGE MTP: Implement GetThumb command
...
* commit 'df8894486c246a8c4e47cc2b3547e9c173225f34':
DO NOT MERGE MTP: Implement GetThumb command
2011-05-04 12:47:14 -07:00
Mike Lockwood
2ac2cc6c56
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
2011-05-04 12:47:10 -07:00
Mike Lockwood
80d39922c8
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
2011-05-04 12:47:06 -07:00
Mike Lockwood
cfea9a409d
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
2011-05-04 12:47:02 -07:00
Marco Nelissen
614a822d87
am 863ee409: (-s ours) am 7dd59229: DO NOT MERGE Fix media scanner uri handling.
...
* commit '863ee40964ef2a017a1116abe37c6b8ad466dd5e':
DO NOT MERGE Fix media scanner uri handling.
2011-05-04 12:46:57 -07:00
Mike Lockwood
20b571fd81
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"
2011-05-04 12:46:52 -07:00
Mike Lockwood
56543aecfd
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:
2011-05-04 12:46:47 -07:00
Mike Lockwood
b281bb0bf7
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.
2011-05-04 12:46:42 -07:00
Mike Lockwood
3e9ea2f73d
am 2572051c: (-s ours) am 0aa5d7b7: DO NOT MERGE Fix deadlock in MountService
...
* commit '2572051c4f6589e5ca8b21158a24a7fa606a5e67':
DO NOT MERGE Fix deadlock in MountService
2011-05-04 12:46:36 -07:00
Mike Lockwood
b88a9ad107
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
2011-05-04 12:46:31 -07:00
Mike Lockwood
8421a0d794
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
2011-05-04 12:46:21 -07:00
Daniel Sandler
8f2ee7dd0e
Merge "New art. FPO, of course."
2011-05-04 12:36:35 -07:00
Robert Ly
607059c45a
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
2011-05-04 12:33:54 -07:00
Robert Ly
329a7c4c1b
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
2011-05-04 12:27:39 -07:00
Robert Ly
7cbb613026
Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1
2011-05-04 12:18:09 -07:00
Jeff Sharkey
e47a9e29ab
Merge "Avoid throwing when forceRefresh() missing server."
2011-05-04 11:58:55 -07:00
Andreas Huber
f297a14f58
Merge "Fix potential memory corruption in NuCachedSource2."
2011-05-04 11:50:48 -07:00
Daniel Sandler
5ff74322e4
Merge "On-screen navigation bar (separate from the status bar)."
2011-05-04 11:26:38 -07:00
Dan Morrill
55f6844c47
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.
2011-05-04 10:29:34 -07:00
Robert Greenwalt
8fdedfd3d3
am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
...
* commit 'f13eb8301f4704179938e374129f2943c9c38d5f':
Add auto-restore timeout for secondary networks.
2011-05-04 10:02:16 -07:00
Robert Greenwalt
9f7aa4c665
Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
2011-05-04 09:59:30 -07:00
Daniel Sandler
6e5734d0fa
Merge "Start honeyphoning the notification panel."
2011-05-04 09:00:18 -07:00
Gloria Wang
a727fab344
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"
2011-05-04 09:00:15 -07:00
Mike Lockwood
2d479be9c6
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()
2011-05-04 08:57:59 -07:00
Mike Lockwood
609e1d9ac6
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
2011-05-04 08:57:56 -07:00
Mike Lockwood
8ee4a063c1
am a792c804: DO NOT MERGE MTP: Implement GetThumb command
...
* commit 'a792c804025e25eb8a110d1db63f26bbd09e0e6b':
DO NOT MERGE MTP: Implement GetThumb command
2011-05-04 08:57:47 -07:00
Mike Lockwood
0910f9ac14
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
2011-05-04 08:57:44 -07:00
Mike Lockwood
b1771c1290
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
2011-05-04 08:57:41 -07:00
Mike Lockwood
8e8b339f8b
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
2011-05-04 08:57:37 -07:00
Marco Nelissen
6b4abeb8b3
am 7dd59229: DO NOT MERGE Fix media scanner uri handling.
...
* commit '7dd592298aefb7921afb86ced444d46cb30ac466':
DO NOT MERGE Fix media scanner uri handling.
2011-05-04 08:57:33 -07:00
Mike Lockwood
a2b52f231f
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"
2011-05-04 08:57:29 -07:00
Mike Lockwood
259d650c71
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:
2011-05-04 08:57:23 -07:00
Mike Lockwood
dbd90e4157
am 10fbba21: DO NOT MERGE MountService: Fix running media scanner at boot.
...
* commit '10fbba21e4827a1582d97aa99e4e8d772ce04920':
DO NOT MERGE MountService: Fix running media scanner at boot.
2011-05-04 08:57:19 -07:00
Mike Lockwood
c45fd5afb4
am 0aa5d7b7: DO NOT MERGE Fix deadlock in MountService
...
* commit '0aa5d7b7f225236ac8461d0b6835b9c6152a2699':
DO NOT MERGE Fix deadlock in MountService
2011-05-04 08:57:12 -07:00
Mike Lockwood
e5f7a9501f
am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
...
* commit 'e3b498be0ae05367e9b84f4fac2ac5cf57a6b091':
DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
2011-05-04 08:57:07 -07:00
Mike Lockwood
6bf48f70f6
am 346a2d79: DO NOT MERGE MountService: Add support for multiple volumes
...
* commit '346a2d79ecd627e38bc7fc6874fb627995b8bc12':
DO NOT MERGE MountService: Add support for multiple volumes
2011-05-04 08:56:55 -07:00
Bjorn Bringert
3ede79dc28
Merge "Check for exceptions before calling back into Java"
2011-05-04 02:56:04 -07:00