47661 Commits

Author SHA1 Message Date
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 Ly
88741823a6 am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1
* commit '7c2d14d59637cfb06ebcfbb091541cebd131fc6a':
  Doc change: fixing minor bug for xml resources bug 4376713
2011-05-03 16:57:52 -07:00
Glenn Kasten
3b698d181b am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1
* commit '9d8c6215d1aedb1e9f2e10c63e737427f13be884':
  Account for race condition when attaching HDMI.
2011-05-03 16:57:45 -07:00
Robert Ly
7c2d14d596 Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1 2011-05-03 16:54:21 -07:00
Robert Ly
0cc4b8a787 Doc change: fixing minor bug for xml resources
bug 4376713

Change-Id: I4c969810eaaf053f8326721b71fbe494b542082d
2011-05-03 16:50:16 -07:00
Glenn Kasten
9d8c6215d1 Merge "Account for race condition when attaching HDMI." into honeycomb-mr1 2011-05-03 16:46:12 -07:00
Wink Saville
3ed0a1ec7a Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE 2011-05-03 16:19:58 -07:00
Ramesh Sudini
0e7b5a0287 IMS: Provide net_admin permission so that IPSec could be configured/used.
IMS configures the security database in kernel with keys generated from ISIM.

Change-Id: Iae9fb85f286ff2a627369d784a127bf7d4d8f4b3
2011-05-03 13:46:08 -07:00
Dan Morrill
75c664582c am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
* commit '8325c3a89197e47cfc2eeb4117c927fb8cb91630':
  Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
2011-05-03 12:26:16 -07:00
Wink Saville
d0d44c4e98 Merge "Make DataConnection asynchronous." into honeycomb-LTE 2011-05-02 23:41:29 -07:00
Wink Saville
0b80114a2d Make DataConnection asynchronous.
Change-Id: Ic0e01dded25ba1fdb3b2c6d0f95a1193f608a0e0
2011-05-02 21:55:04 -07:00
Dan Morrill
8325c3a891 Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change
since file was renamed, making cherry-pick impossible.

Change-Id: Idc802af57fb9926a69ed52d4e776ef57d8b647c6
2011-05-02 14:06:06 -07:00
Robert Greenwalt
a47c40193f Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 2011-05-02 13:26:52 -07:00
Irfan Sheriff
8ab6a6d415 Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 2011-05-02 11:49:46 -07:00
Robert Greenwalt
aa70f101e0 Add RouteInfo objects for tracking routes.
Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
2011-05-02 11:17:30 -07:00
Wink Saville
7e74c60db5 Merge "Enhance AsyncChannel." into honeycomb-LTE 2011-05-02 10:47:05 -07:00
Wink Saville
0246bbc8d7 Enhance AsyncChannel.
- Use  Protocol for BASE of CMD's.
- Add synchronous connect methods.
- Back port sha1 c23971b3e4f92ac31996d4f9f32eef3cb4ef65fd from master

Change-Id: If0b3f6cbbb8d4268cad6ca19d26ab2ee42390d86
2011-05-02 10:44:56 -07:00
Wink Saville
aa44b52ee0 Fix bug in RIL#getDataCallState.
Change-Id: I568e25d85888aa40b6a0b5e7f2d016e409f73ce1
2011-05-02 10:00:53 -07:00
Irfan Sheriff
31be7cf4c7 Add DhcpStateMachine for interation with dhcpcd
- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
  simultaneously
- Optionally, a controller can request a notification prior
  to DHCP request/renewal being sent

Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93
2011-04-30 12:58:51 -07:00
Wink Saville
6e748780ef Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE 2011-04-29 16:12:59 -07:00
Scott Main
511ec082bb am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit 'de506220d8a3d453463e1abe1b2eb54afd48ec93':
  docs: more documentation for ProgressBar
2011-04-29 14:59:08 -07:00
Scott Main
de506220d8 am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '1462813a28270d4255f9542b666960182e274a6e':
  docs: more documentation for ProgressBar
2011-04-29 14:55:43 -07:00
Scott Main
1462813a28 Merge "docs: more documentation for ProgressBar" into honeycomb 2011-04-29 14:52:20 -07:00
Scott Main
42f139c069 docs: more documentation for ProgressBar
Change-Id: Ief415c0b22da3e7d4ea318e321edc7d215603f0f
2011-04-29 14:51:05 -07:00
Scott Main
205d6fb38d am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers
* commit 'be2da3c9b64c7ced6acc9933e0b941a8ee4239fb':
  docs: tweak table headers for config qualifiers
2011-04-29 14:46:28 -07:00
James Dong
f181e416ee am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
* commit 'ec78f551b575b0274cbe796f8e08a9df1a706680':
  Add avg bandwidth estimate every 2 seconds - do not merge.
2011-04-29 14:42:58 -07:00
Scott Main
be2da3c9b6 am c7eb47fa: docs: tweak table headers for config qualifiers
* commit 'c7eb47fad4fe39bd85c6205e38426c1867b9ed92':
  docs: tweak table headers for config qualifiers
2011-04-29 14:42:55 -07:00
Scott Main
c7eb47fad4 docs: tweak table headers for config qualifiers
Change-Id: Idc8d48f1db9b6b87372a49095b034edff9baecfa
2011-04-29 14:12:24 -07:00
Kazuhiro Ondo
f0055d5e3c CDMALTE: Evaluate data network type in pollStateDone()
During LTE to HRPD handover, CDMA data network type (1X, DO, RevA)
was not detected immediately as the checking was not done without
waiting for the LTE state. The patch will wait for pollStateDone
to determine new data network state.

Change-Id: I2d63d43df1f3124ba27f77897abef30f06be650d
2011-04-29 11:47:07 -07:00
Robert Greenwalt
5f2ff42b28 Add data to bugreports.
Include IPv6 routes and iptables data.

Change-Id: Ie9bca8a935f93933082eef0c45f83a17be76b7ed
2011-04-29 09:43:49 -07:00
James Dong
ec78f551b5 Add avg bandwidth estimate every 2 seconds - do not merge.
This patch is meant for testing only.
We will remove this patch once we tracked down all those spinning issues.

related-to-bug: 4339075

Change-Id: I4cf1927f1067d4f7dbc589ceb3c47407eaf40ae7
2011-04-28 17:16:03 -07:00
Scott Main
d7f739b13e am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
* commit '114ba198f5ae19fc0a632e18369a912c54a0c44e':
  docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:25:22 -07:00
Scott Main
114ba198f5 am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
* commit 'c59e80c4eb60a0ba665571fee2f9561aa6e936ff':
  docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:21:46 -07:00
Scott Main
c59e80c4eb Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb 2011-04-28 14:08:57 -07:00
Wink Saville
a68a61dfe3 Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE 2011-04-28 13:51:31 -07:00
Wink Saville
05fcd239ab Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE 2011-04-28 13:51:22 -07:00
Ramesh Sudini
11cee41f3e Telephony: Corrections to signal strength values.
RSRP is already -ve.

Change-Id: Ieff689a98088ad6aad9cfc6516169c92bbb0015d
2011-04-28 12:24:55 -07:00
Ramesh Sudini
662b016d6e Telephony: Data availability indication upon records loaded.
This will make sure if records loaded comes after radio availability we dont miss sending
out dataAvailability.

Change-Id: Ibbecaa89f28e1441e799bf1681d0b4692cf0f13a
2011-04-28 12:24:13 -07:00