47858 Commits

Author SHA1 Message Date
Bill Gruber
48f472f748 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
2011-05-05 16:05:41 -07:00
Scott Main
0cdd9f7def docs: add package description for mtp and a little more info to MtpDevice
Change-Id: I44b3926c4a286f624de525a7f0cc896879582bf5
2011-05-05 15:53:44 -07:00
Bill Gruber
0369cf9874 Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080
IAB docs: adds best practices for pending transaction UI

Change-Id: I9e27f3421e57b20c5b5961fc680fe89e3d5e865b
2011-05-05 15:49:25 -07:00
Scott Main
4c8fa6d135 am 1c71fffe: update platform version number for docs
* commit '1c71fffeb5d6a241ccbe7f035ce0d030eaeef562':
  update platform version number for docs
2011-05-05 15:18:19 -07:00
Scott Main
1c71fffeb5 update platform version number for docs
Change-Id: If0866ab1544ce0f5e70bbbe93d30ed27c4403406
2011-05-05 14:49:47 -07:00
Teng-Hui Zhu
a8f6a0d90c DO NOT MERGE: Don't send pause again when coming back from full screen
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
2011-05-05 14:34:26 -07:00
Ramesh Sudini
cf7db80a9a Add Delay for data connection retry.
Change-Id: Id2c6db09827f29198e38fb9ade4141fab9fa29fc
2011-05-05 14:18:48 -07:00
Ramesh Sudini
a29e094a98 DataConnection: Fix handling of PDP setup failure.
Change-Id: Ib73c5aad1f9f07ddca7e2e0b3dfba6ed40aa47ef
2011-05-05 14:05:19 -07:00
Scott Main
475917c7e4 am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
* commit 'e6746acde2a0cc4faad9bdec026a9554797e2f94':
  docs: update homepage to announce 3.1
2011-05-05 08:43:42 -07:00
Scott Main
e6746acde2 Merge "docs: update homepage to announce 3.1" into honeycomb-mr1 2011-05-05 08:33:03 -07:00
Wink Saville
676db0d301 Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE 2011-05-04 17:01:32 -07:00
Robert Ly
2246bc665d am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
* commit '7157b7c31462e9340847d15d936bbb0b1117ecbb':
  doc change: a misplaced link removed
2011-05-04 17:00:10 -07:00
Robert Ly
7157b7c314 Merge "doc change: a misplaced link removed" into honeycomb-mr1 2011-05-04 16:55:59 -07:00
Robert Greenwalt
aacd80fd87 Fix build break.
Change-Id: Ic61448f468fb97a2ae032bf5782b33ed8972e20f
2011-05-04 16:50:10 -07:00
Robert Ly
d834113247 doc change: a misplaced link removed
Change-Id: If8b12e5409b44a095593b126a18fa6c0d572cc59
2011-05-04 16:41:40 -07:00
Katie McCormick
7d51365238 am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
* commit '62922c361e0c1b36c3787d7f06d04c3a609c2b12':
  Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
2011-05-04 15:47:10 -07:00
Katie McCormick
62922c361e Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
Change-Id: I9633f380f701bfa63453c9e969eeb0236a37894e
2011-05-04 15:34:28 -07:00
Wink Saville
ed2989a9e1 Fix 4379712 NPE in GsmDataConnectionTracker
Releasing the apnContext too soon and move getting the dc and dcac
into the ok path.

Bug: 4379712
Change-Id: I0296b65ec5842b0219269a73d48ac39086c382fd
2011-05-04 15:16:12 -07:00
Scott Main
f9e9452c2d 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
2011-05-04 15:09:53 -07:00
Scott Main
ad3b87aa0d cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3
docs: update dashboard for platform versions

Change-Id: I21ddf27d0ad5bba817f6995ae716c6dc1029c0a5
2011-05-04 15:03:38 -07:00
Scott Main
bb4ffd45c8 am 41703766: docs: typo in menu doc
* commit '41703766815918c96fa0f45c6f27a29a0865846a':
  docs: typo in menu doc
2011-05-04 14:41:35 -07:00
Scott Main
d566dc1906 am 7017c942: docs: fix issue 4383086
* commit '7017c94249f7d27643fefd242e9faf9e53ce986e':
  docs: fix issue 4383086
2011-05-04 14:37:10 -07:00
Scott Main
4170376681 docs: typo in menu doc
Change-Id: Ic67cce880406a7daeb98d37312dd34c6a681a7af
2011-05-04 14:36:56 -07:00
Scott Main
7017c94249 docs: fix issue 4383086
Change-Id: I43fa88645b6b81102452d4a977ce5579275a2235
2011-05-04 14:33:46 -07:00
Scott Main
8f5379b4d7 docs: update homepage to announce 3.1
Change-Id: Ide4175f48b765484f0a1bbb5be3bc56e79e97612
2011-05-04 13:38:05 -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
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
Robert Greenwalt
f13eb8301f Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 2011-05-04 09:59:30 -07:00
Mike Lockwood
36132a488b DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
This will prevent MediaProvider from adding these files to the images table

Change-Id: Ice4756b64a067f3aceff08ab2c5e91665109dde5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:21 -04:00
Mike Lockwood
8b1c74f96f DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
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: I2b04b872ece69441387c7fa579441a53f6f358d3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:21 -04:00
Mike Lockwood
a792c80402 DO NOT MERGE MTP: Implement GetThumb command
This allows the PC to access thumbnails in JPEG files over MTP/PTP

Bug: 3219495

Change-Id: I565be1fb84e8a204f2be11342b5b952e8965afdf
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:21 -04:00
Mike Lockwood
af50821bac DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
Change-Id: Ied2b60e4af5606cb405d048f416e8a7eb3c4d5b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:20 -04:00
Mike Lockwood
fdb50e6f8e DO NOT MERGE MTP: Add extended operations to support in-place editing of files
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: I000930b787b00a2da0b57de9790053b2d71b86fd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:20 -04:00
Mike Lockwood
fb6232635d DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding 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: Ib707f329be98878501952b6054998518a6eabbbd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:20 -04:00
Marco Nelissen
7dd592298a DO NOT MERGE Fix media scanner uri handling.
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: Ie589c9b52b436d73e295609d21238b2b3e829502
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:20 -04:00
Mike Lockwood
c535f7f291 DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
We need this to allow MTP to access secondary external storage devices

This reverts commit 35a2ea2fbf156a503d1b0bc6ca7784e51e2462f4.

Conflicts:

	data/etc/platform.xml

Change-Id: Iaf9cf120217e8417d328a51db0d82be6835b0ff0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:20 -04:00
Mike Lockwood
d3e4290c04 DO NOT MERGE MTP and media provider support for multiple storage devices:
- 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: I53d501fd4891ebe27408135fb598027e06b7e495
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:20 -04:00
Mike Lockwood
10fbba21e4 DO NOT MERGE MountService: Fix running media scanner at boot.
Change-Id: Ia56573023f21fa067a14e7d3ac5a6dbd51ecc8a7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:19 -04:00
Mike Lockwood
0aa5d7b7f2 DO NOT MERGE Fix deadlock in MountService
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: Iaadfb1b8be5567c8e228a8fbc69d4d483c8dc987
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:19 -04:00
Mike Lockwood
e3b498be0a DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
Change-Id: I8ba7e56797b0106dafaa6388393e5c629f27e6e6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:19 -04:00
Mike Lockwood
346a2d79ec DO NOT MERGE MountService: Add support for multiple volumes
Change-Id: I18527e78a1c04023ae7bc0f269eaac082eb48d7f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:19 -04:00
Robert Greenwalt
f2102f7a1a Add auto-restore timeout for secondary networks.
Settable per network so you can have not timeout for some and some for others.
If you set the old NETWORK_RESTORE_DELAY_PROP_NAME system property
(android.telephony.apn-restore) it will override this value.

Change-Id: Icca706fdc74245dce679209116660e5dc4b05d23
2011-05-03 19:10:26 -07:00
Mike Lockwood
c56ad54bd9 DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
This will prevent MediaProvider from adding these files to the images table

Change-Id: Ibc4128762f221b370a00e331aca633aafae0ad70
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:57 -04:00
Mike Lockwood
71b3342a58 DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
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>
2011-05-03 21:03:57 -04:00
Mike Lockwood
710a206445 DO NOT MERGE MTP: Implement GetThumb command
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>
2011-05-03 21:03:57 -04:00
Mike Lockwood
7fc3bebb5e DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
Change-Id: Ie0b979b5cfd9b5f9e9196c5f8c8ecccef6ed84c3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:57 -04:00
Mike Lockwood
371279f802 DO NOT MERGE MTP: Add extended operations to support in-place editing of files
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>
2011-05-03 21:03:56 -04:00
Mike Lockwood
9c112a86de DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding 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>
2011-05-03 21:03:56 -04:00