summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTEThe Android Automerger2011-05-082-2/+6
|\
| * Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2The Android Automerger2011-05-0826-134/+1613
| |\
| * | DO NOT MERGE Handle GET_POWER failuresIrfan Sheriff2011-05-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Return a failure when GET_POWER returns a non-conforming format Bug: 4380317 Change-Id: Ie723c424ab07774f2be2594aa5deeaa5cd5ac280
| * | DO NOT MERGE: Don't send pause again when coming back from full screenTeng-Hui Zhu2011-05-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | When we enter full screen, the inline video has been paused. When we re-play in the inline mode, we don't need to paused the previous video, which is the full screen one. bug:4259109 Change-Id: I577edf43563116b0d1a9266d741e6a8aabbca779
| * | DO NOT MERGE MediaScanner: Add special casing of WMP album art files to ↵Mike Lockwood2011-05-031-29/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | isNoMediaPath() This will prevent MediaProvider from adding these files to the images table Change-Id: Ibc4128762f221b370a00e331aca633aafae0ad70 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-031-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't let the "no media" status of one directory leak to the remaining files and directories in the same parent. Bug: 4364077 Change-Id: Ie756ccd06b1962b06143fc02a1a3927c3aba143a Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-037-2/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the PC to access thumbnails in JPEG files over MTP/PTP Bug: 3219495 Change-Id: Id61f353ba70e896fae9a47338bf7871c0f185d3e Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-032-24/+29
| | | | | | | | | | | | | | | Change-Id: Ie0b979b5cfd9b5f9e9196c5f8c8ecccef6ed84c3 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-036-38/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MTP does not support partial writes of files (the entire file must be transferred at once). This makes it impossible to implement a FUSE file system for MTP with acceptable performance. To fix this problem, this change adds extended MTP operations to allow partial writes to files: SendPartialObject - allows writing a subset of a file, or appending to the end of a file TruncateObject - allows changing the size of a file BeginEditObject - must be called before using SendPartialObject and TruncateObject EndEditObject - commits changes to a file after it has been edited with SendPartialObject or TruncateObject We also add GetPartialObject64, which is the same as GetPartialObject but has a 64 bit offset rather than 32. Change-Id: Id5365e1c4dc55a2d819c16c9db0a3ac2260f9309 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding ↵Mike Lockwood2011-05-035-124/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files from the media provider Previously we ignored any files and directories that had name started with '.' and ignored any directories that contained a ".nomedia" file. Now to support transferring any file via MTP, we now add these previously ignored files to the media database, but will not mark them as audio, video, image or playlist files. That way they will be included in the files table but will be hidden from the audio, video, images and playlist views that are used by apps like Music and Gallery. Bug: 3405327 Change-Id: Ibb37bb2856a0684ce9f685ed565ad35347622834 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | DO NOT MERGE Fix media scanner uri handling.Marco Nelissen2011-05-031-21/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file was originally considered a video file (because it had a .mp4 extension, for example), but was then discovered to have only an audio track, it would update the type, but not the URI for insertion into the media provider. Change-Id: I25652a031b98d2ec2433263dd6f344ba90d2d112 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"Mike Lockwood2011-05-032-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this to allow MTP to access secondary external storage devices This reverts commit 35a2ea2fbf156a503d1b0bc6ca7784e51e2462f4. Conflicts: data/etc/platform.xml Change-Id: I0b139a0f3b369c1080831a5b3a48f5d9a330b1bb Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-0311-104/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - MTP support for multiple storage units - Add storage_id column to media database for MTP storage ID - Add framework resource for defining mount points and user visible descriptions for multiple volumes - Clean up locking in MtpServer JNI code Change-Id: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | DO NOT MERGE MountService: Fix running media scanner at boot.Mike Lockwood2011-05-031-0/+7
| | | | | | | | | | | | | | | Change-Id: I67ff2ccde7e03143167b8c59726ffb741c96e028 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | DO NOT MERGE Fix deadlock in MountServiceMike Lockwood2011-05-031-17/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not safe to call into vold with a lock held on mVolumeStates since we will receive events back from vold on a different thread. So in the boot completed handler we make a copy of the volume list and then call vold to mount volumes after releasing the lock Change-Id: Ic9836c2e1e8a5677d0c4e33476a72081f69823a0 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methodsMike Lockwood2011-05-033-0/+68
| | | | | | | | | | | | | | | Change-Id: I43d5c1730b340f1288b58012234b38f801001b71 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | DO NOT MERGE MountService: Add support for multiple volumesMike Lockwood2011-05-031-108/+111
| | | | | | | | | | | | | | | Change-Id: I45ee0e5735a6d72c635f6d22320e8b13bccc3847 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5Scott Main2011-05-061-12/+12
|\ \ \ | | |/ | |/| | | | | | | * commit '5cf78ecd2c523be442f52888ca613b9a92325a6c': docs: update sdk tools sums and sizes based on candidate 5
| * | docs: update sdk tools sums and sizesScott Main2011-05-061-12/+12
| | | | | | | | | | | | | | | | | | based on candidate 5 Change-Id: I10929c0dfd889c919d70a4aaa4854ce1fecbc51d
* | | am b6451228: docs: update screens dashboard and add opengl dashboardScott Main2011-05-063-24/+126
|\ \ \ | |/ / | | | | | | | | | * commit 'b6451228526288b158c3b0bf0c5abbd5b072d51c': docs: update screens dashboard and add opengl dashboard
| * | docs: update screens dashboard and add opengl dashboardScott Main2011-05-063-24/+126
| | | | | | | | | | | | Change-Id: Ic810bc9bb2a917ef1489f3d5f6c30b1bb75cb2e1
* | | Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTERobert Greenwalt2011-05-061-2/+5
|\ \ \
| * | | Fix 2 functions getting connections up by apnTypeRobert Greenwalt2011-05-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A bad impl that only effected non-default connections on CDMA. bug:4392820 Change-Id: If178dba90c4525289098fc88b80cf918e35f4d32
* | | | Merge "Mark a disable apn so we don't reconnect." into honeycomb-LTERobert Greenwalt2011-05-062-50/+5
|\ \ \ \
| * | | | Mark a disable apn so we don't reconnect.Robert Greenwalt2011-05-062-50/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strip out the pending-action stuff so things are more clear. bug:4378382 Change-Id: I0e98559c88dccd50169c29d1e74421acb4246b78
* | | | | am 223a94d2: docs: de-new the dev guide tocScott Main2011-05-061-24/+17
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '223a94d2effd0ba9ef205d0bb790a5bdfb4d54c0': docs: de-new the dev guide toc
| * | | | docs: de-new the dev guide tocScott Main2011-05-061-24/+17
| | | | | | | | | | | | | | | | | | | | Change-Id: I11ab2fcb8472876aa0776383490390d502475e39
* | | | | am 9f7054fe: Merge "docs: add package description for mtp and a little more ↵Scott Main2011-05-062-1/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | info to MtpDevice" into honeycomb-mr1 * commit '9f7054fea28e65ae1bf8bc1114090306979ba657': docs: add package description for mtp and a little more info to MtpDevice
| * | | | Merge "docs: add package description for mtp and a little more info to ↵Scott Main2011-05-062-1/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | MtpDevice" into honeycomb-mr1
| | * | | | docs: add package description for mtp and a little more info to MtpDeviceScott Main2011-05-052-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I44b3926c4a286f624de525a7f0cc896879582bf5
* | | | | | am f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1Scott Main2011-05-052-4/+33
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'f88b52fbf693d8b17e57a9d2fdda5a29e1bfa8d9': docs: version notes for tools 11
| * | | | | Merge "docs: version notes for tools 11" into honeycomb-mr1Scott Main2011-05-052-4/+33
| |\ \ \ \ \
| | * | | | | docs: version notes for tools 11Scott Main2011-05-052-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id33ba830b550d8d99b23f012501023b4675ba3eb
* | | | | | | am 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1Scott Main2011-05-051-0/+28
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '46524f83a55731cd96c9df8a87be6dacb1db1a37': docs: add package description for RTP
| * | | | | | Merge "docs: add package description for RTP" into honeycomb-mr1Scott Main2011-05-051-0/+28
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | docs: add package description for RTPScott Main2011-05-051-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I02c181a48101be288fb4aabf497f573f00038f90
* | | | | | | am 034d89d9: docs: cherrypick Change-Id: ↵Scott Main2011-05-053-33/+106
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs * commit '034d89d9a4b56014ea198bcdeaa5ad922608ae40': docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs
| * | | | | | docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259eScott Main2011-05-053-33/+106
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs Change-Id: I4e301fe005d8fb4d04550b7db5afe2b63fe66802
* | | | | | Merge "Add Delay for data connection retry." into honeycomb-LTEWink Saville2011-05-053-3/+5
|\ \ \ \ \ \
| * | | | | | Add Delay for data connection retry.Ramesh Sudini2011-05-053-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2c6db09827f29198e38fb9ade4141fab9fa29fc
* | | | | | | Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTEWink Saville2011-05-051-0/+3
|\ \ \ \ \ \ \
| * | | | | | | DataConnection: Fix handling of PDP setup failure.Ramesh Sudini2011-05-051-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib73c5aad1f9f07ddca7e2e0b3dfba6ed40aa47ef
* | | | | | | am 0369cf98: Cherry pick from Honeycomb Change ID ↵Bill Gruber2011-05-051-9/+53
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | 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
| * | | | | Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080Bill Gruber2011-05-051-9/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IAB docs: adds best practices for pending transaction UI Change-Id: I9e27f3421e57b20c5b5961fc680fe89e3d5e865b
* | | | | | am 1c71fffe: update platform version number for docsScott Main2011-05-051-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '1c71fffeb5d6a241ccbe7f035ce0d030eaeef562': update platform version number for docs
| * | | | | update platform version number for docsScott Main2011-05-051-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: If0866ab1544ce0f5e70bbbe93d30ed27c4403406
* | | | | am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1Scott Main2011-05-051-8/+10
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | * commit 'e6746acde2a0cc4faad9bdec026a9554797e2f94': docs: update homepage to announce 3.1
| * | | Merge "docs: update homepage to announce 3.1" into honeycomb-mr1Scott Main2011-05-051-8/+10
| |\ \ \
| | * | | docs: update homepage to announce 3.1Scott Main2011-05-041-8/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: Ide4175f48b765484f0a1bbb5be3bc56e79e97612
* | | | | Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTEWink Saville2011-05-043-21/+58
|\ \ \ \ \
generated by cgit v1.1 at 2025-02-02 06:02:48 +0000