drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,001 Commits 1 Branch 0 Tags
Commit Graph

50001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
8f5379b4d7 docs: update homepage to announce 3.1 
Change-Id: Ide4175f48b765484f0a1bbb5be3bc56e79e97612
 2011-05-04 13:38:05 -07:00
Robert Ly
427a51ab73 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
70b276a162 Merge "Signal an error if aac decoding fails early." 2011-05-04 13:18:36 -07:00
Robert Ly
232ea51c9c 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
7c8be3a75d 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
762481f0b5 Merge "adding the usb apis to the resources browser" into honeycomb-mr1 2011-05-04 13:10:54 -07:00
Andreas Huber
19127e7162 Signal an error if aac decoding fails early. 
Change-Id: I8b886a7642aaf83fa008fefb38cb4f92267ca948
related-to-bug: 4272179
 2011-05-04 13:09:35 -07:00
Jason Sams
a458781869 Merge "Fix error checks on compute context creation. Remove GL init for compute scripts." 2011-05-04 12:59:50 -07:00
Robert Ly
645ab2a477 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
3badd3fdd5 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
b6f8bff109 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
9f47d10e6a 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
ebd04b758d 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
8ceb534c6f 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
b6b0d0c5b1 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
4f37a69848 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
4fcbd62275 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
f1dac2c931 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
fad0945211 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
bf81f4889c 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
7c91301d57 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
c67085832f 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
9ab62148df 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
acf9db1a27 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
67440d15e3 Merge "New art. FPO, of course." 2011-05-04 12:36:35 -07:00
Robert Ly
4c8112f2f8 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
f0a1d683d9 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
fd7974f531 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
a62057496b Merge "Avoid throwing when forceRefresh() missing server." 2011-05-04 11:58:55 -07:00
Jeff Sharkey
f055829f35 Avoid throwing when forceRefresh() missing server. 
Bug: 4377651
Change-Id: Ia950a1e62d39ce9148827ebb4535f6441911b195
 2011-05-04 11:58:06 -07:00
Andreas Huber
c016e0f8eb Merge "Fix potential memory corruption in NuCachedSource2." 2011-05-04 11:50:48 -07:00
Daniel Sandler
f8d704b51d Consolidate notification layouts by removing xlarge versions. 
This will bring the phone and the tablet very strongly in line.

Any readability/usability/functional improvements we make for
one should appear instantly in the other.

Change-Id: I51baeed07936304ec842a338864205bacf6e646f
 2011-05-04 14:44:28 -04:00
Andreas Huber
13aa6c2d8a Fix potential memory corruption in NuCachedSource2. 
Change-Id: Ia6bd2d4966287228a3ac1b067ee1f1ccad965dbb
related-to-bug: 4354845
 2011-05-04 11:43:43 -07:00
Daniel Sandler
0c19aaaebb Merge "On-screen navigation bar (separate from the status bar)." 2011-05-04 11:26:38 -07:00
Dan Morrill
6d36190a73 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
Gilles Debunne
6e222bcadb Off by one bug in TextView's suggestions popup. 
Change-Id: I39615bb75e1e2e24ba5c5a65f1b3e11f8fadd89f
 2011-05-04 10:25:04 -07:00
Robert Greenwalt
9c7e6fc506 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
f13eb8301f Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 2011-05-04 09:59:30 -07:00
Andreas Huber
65b9605976 Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2 
Change-Id: I3dc50e6e447668ac8b8c2956329352635750a2cd
related-to-bug: 4381047
 2011-05-04 09:48:46 -07:00
Daniel Sandler
d108538546 Merge "Start honeyphoning the notification panel." 2011-05-04 09:00:18 -07:00
Gloria Wang
4f55af7ba6 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
63de615ddb 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
0faefb72fb 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
df8894486c 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
af964a632d 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
eeaf48ca85 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
f6df5b41e1 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
863ee40964 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
4397c32402 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
21c0800f71 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