49893 Commits

Author SHA1 Message Date
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
Mike Lockwood
20c3561284 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
2572051c4f 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
a2a8419db8 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
60c768d412 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
Daniel Sandler
b48e74b10c Start honeyphoning the notification panel.
Notifications on phones should look much more like Honeycomb
now, including large icon and veto support.

And less crashing.

Bug: 4322305
Change-Id: Ibde6f66fbae1c8d3167085f7b0fd79118485f05c
2011-05-04 11:17:07 -04: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
Bjorn Bringert
d58efd38e7 Merge "Check for exceptions before calling back into Java" 2011-05-04 02:56:04 -07:00
Adam Powell
e04074a39c Merge "Fix bug 4361642 - Action menu unresponsive after orientation change" 2011-05-03 21:05:38 -07:00
Adam Powell
31bb97d240 Fix bug 4361642 - Action menu unresponsive after orientation change
Through invalidating panel menus and action bar initialization it was
possible for instance state restoration to throw out a new menu
already in use. Invalidate the menu if it already exists instead. The
saved instance state will be applied later if a relevant panel menu is
shown.

Change-Id: I6bad7640ecb8d2f5f8ea658e1c68b07d52d108b9
2011-05-03 21:03:24 -07:00
Mathias Agopian
a5720192fe Merge "Fix a race in SurfaceFlinger that could cause layers to be leaked forever." 2011-05-03 20:46:38 -07:00
Mathias Agopian
6dcb1557ef Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
The transaction flags were atomically read-and-cleared to determine if
a transaction was needed, in the later case, mStateLock was taken to
keep the current state still during the transaction. This left a small
window open, where a layer could be removed after the transaction flags
were checked but before the transaction was started holding the lock.
In that situation eTraversalNeeded would be set but only seen during the
next transaction cycle; however, because we're handling this transaction
(because of another flag) it will be commited, "loosing" the information
about the layer being removed -- so when the next transaction cycle due
to eTraversalNeeded starts, it won't notice that layers have been removed
and won't populated the ditchedLayers array.

Change-Id: Iedea9e25fee8dd98a0c5bd5ad41a20fcadf75b47
2011-05-03 20:44:51 -07:00
Adam Powell
f3cd1d957c Bug 4269063 - Populate contentdescription in action bar
home/up and action menu

Change-Id: Ia09d78d9d37848621e025b9af93a92cfd3bb8dc7
2011-05-03 19:43:55 -07: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
Adam Powell
e409851954 Merge "Fix bug 4355335 - android.app.cts.DialogTest.testContextMenu failing on IRJ28" 2011-05-03 17:33:02 -07:00
Adam Powell
d1f4207ba5 Fix bug 4355335 - android.app.cts.DialogTest.testContextMenu failing on IRJ28
Change-Id: Icfcd8c2aadd0fb9e49296b8318858317407e1b7f
2011-05-03 17:30:48 -07:00
Jason Sams
2698536b3f Fix error checks on compute context creation.
Remove GL init for compute scripts.

Change-Id: I1bce8e4112babf4345fa56a30a9bed753734d8d6
2011-05-03 17:27:26 -07:00
Robert Ly
e98c27e5e4 am 79eb7876: am 88741823: am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1
* commit '79eb78769c8ecd92624f0171d9f22d95fc093b00':
  Doc change: fixing minor bug for xml resources bug 4376713
2011-05-03 17:03:21 -07:00
Glenn Kasten
f639533484 am a98bcdf6: am 3b698d18: am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1
* commit 'a98bcdf61dda9d64b4f584ce34c76df79409916a':
  Account for race condition when attaching HDMI.
2011-05-03 17:03:18 -07:00
Robert Ly
79eb78769c am 88741823: am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1
* commit '88741823a67fd8246b3926464bfaa2081b330f40':
  Doc change: fixing minor bug for xml resources bug 4376713
2011-05-03 16:59:34 -07:00
Glenn Kasten
a98bcdf61d am 3b698d18: am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1
* commit '3b698d181b7f165c9b31f7d74be19a5ed7575347':
  Account for race condition when attaching HDMI.
2011-05-03 16:59:31 -07: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
Gloria Wang
c6091ddd3a 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

Change-Id: I0055beba38ac761627dbcc6d581ae9582d68bb94
2011-05-03 16:41:17 -07:00
Iliyan Malchev
b2a153adc9 frameworks/base: android_native_buffer_t -> ANativeWindowBuffer
Change-Id: Idc2eabaa805bb6d308ebb315872623f28d428417
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-03 16:40:14 -07:00
Iliyan Malchev
be0cc36525 frameworks/base: move ANativeWindow/android_native_buffer_t out
These definitions have been moved to system/core.

Change-Id: I021b6b5f2fd72d538b5ccdcb33860ebd3004d9ad
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-03 16:39:54 -07:00
Iliyan Malchev
bf8b45cd15 Merge changes I5c61ac40,I67c40a3c,I3e2ddd01
* changes:
  frameworks/base: switch CameraService to a HAL module
  frameworks/base: make the ANativeWindow query() method const
  frameworks/base: include system/core header camera.h in Camera.h
2011-05-03 16:38:07 -07:00
Wink Saville
ec9b5d17af am ee081bf5: am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE
* commit 'ee081bf5ee936396a89d5bd2b29487047b260f49':
  IMS: Provide net_admin permission so that IPSec could be configured/used.
2011-05-03 16:36:36 -07:00
Mathias Agopian
50a2f8f661 Merge "Fix a race-condtion in SurfaceFlinger that could lead to a crash." 2011-05-03 16:34:06 -07:00
Wink Saville
ee081bf5ee am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE
* commit '3ed0a1ec7aa6364c236721a1bd29fd196f259cba':
  IMS: Provide net_admin permission so that IPSec could be configured/used.
2011-05-03 16:33:08 -07:00
Mathias Agopian
5fa7ad6fa1 Fix a race-condtion in SurfaceFlinger that could lead to a crash.
Client::mLayers could be accessed from different threads.
On one side from Client::attachLayer() which is currently
called from a binder thread; on the other side from
Client::detachLayer() which is always called from the main
thread.

This could lead to a corruption of Client::mLayers.

We fix this issue by adding an internal lock to Client.

Change-Id: Ib1317d7750ed5030e6f577efe34b69fc10198bd3
2011-05-03 16:21:41 -07:00