OSDN Git Service
Mike Lockwood [Tue, 10 May 2011 02:08:06 +0000 (19:08 -0700)]
StorageManager: Clean up and generalize storage configuration resources
Replace config_emulateExternalStorage, config_externalStorageRemovable,
config_externalStoragePaths, config_externalStorageDescriptions and
config_mtpReserveSpaceMegabytes resources with an XML resource file
to describe the external storages that are available.
Add android.os.storage.StorageVolume class
StorageManager.getVolumeList() now returns an array of StorageVolume
Change-Id: I06ce1451ebf08b82f0ee825d56d59ebf72eacd3d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Scott Main [Sat, 14 May 2011 03:29:45 +0000 (20:29 -0700)]
am
f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit '
f73dcad35d031afc8e4db767d9b8bc40f389e4fc':
docs: update homepage I/O announcement
Scott Main [Sat, 14 May 2011 03:26:56 +0000 (20:26 -0700)]
Merge "docs: update homepage I/O announcement" into honeycomb-mr1
Dianne Hackborn [Wed, 20 Apr 2011 01:44:03 +0000 (18:44 -0700)]
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
And clean up some documentation.
Change-Id: I8f06e2fc3bb6c552581b64657e82ba690d524232
Xavier Ducrohet [Fri, 13 May 2011 23:30:44 +0000 (16:30 -0700)]
am
2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '
2fae858db55fc6984ef923a6226b9408c37c72cb':
LayoutLib: implement data binding for most AdapterView
Dianne Hackborn [Fri, 13 May 2011 23:24:32 +0000 (16:24 -0700)]
Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
Xavier Ducrohet [Tue, 29 Mar 2011 18:58:02 +0000 (11:58 -0700)]
LayoutLib: implement data binding for most AdapterView
Change-Id: I27be96ed2c37573eb22cfbb391d96b6137b3df8c
Dianne Hackborn [Fri, 13 May 2011 22:33:21 +0000 (15:33 -0700)]
Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
Adam Powell [Fri, 13 May 2011 21:09:54 +0000 (14:09 -0700)]
Fix a bug where an action bar could be created when it should not be.
Change-Id: I9ca1038accdb6d0a539750ed8ab068a41612f6ae
Jeff Brown [Fri, 13 May 2011 19:51:12 +0000 (12:51 -0700)]
Fix bounds check.
Bug:
4413945
Also remove dead code from header file.
Change-Id: I4e9fc9d7f8612fedb436e62649d308bd737ed138
Dianne Hackborn [Sat, 16 Apr 2011 02:00:20 +0000 (19:00 -0700)]
DO NOT MERGE. Integrate fragment work from master
Back-port new fragment detach APIs from support lib.
This allow a much cleaner implementation of things like the
fragment pager class.
Integrate from support lib: fix restore of list state.
The FragmentManager/ListFragment impl was restoring the list
state before setting its adapter. This caused the list view to
lose the state, since it gets cleared as part of setting the
adapter. Now the fragment manager waits on restoring the view
hierarchy state until after it has done onActivityCreated(),
at which point we have set the adapter.
It would be nice to make list view less fragile in this regard,
but that is for a different change.
Change-Id: I38606ef7d0b06478995f3fb7726aead67420e172
Scott Main [Fri, 13 May 2011 18:27:18 +0000 (11:27 -0700)]
docs: update homepage I/O announcement
Change-Id: If61bfdf40c3b1d0c95b9a2694a849edf5e53bb54
Dianne Hackborn [Fri, 13 May 2011 18:16:42 +0000 (11:16 -0700)]
Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
Scott Main [Fri, 13 May 2011 17:56:52 +0000 (10:56 -0700)]
am
edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit '
edab852fe11f12ad5a0a66f79462ed7474ba9e5a':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
Scott Main [Fri, 13 May 2011 17:55:09 +0000 (10:55 -0700)]
am
432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
* commit '
432fbcc55ff3e0900a50b70b9d5dbdab77a276f7':
docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
Scott Main [Fri, 13 May 2011 17:54:00 +0000 (10:54 -0700)]
Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
Dianne Hackborn [Fri, 13 May 2011 01:07:47 +0000 (18:07 -0700)]
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp". These are the minimum screen width/height in "dp"
units. This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.
This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes. Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted. To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.
Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
Dianne Hackborn [Thu, 12 May 2011 22:45:21 +0000 (15:45 -0700)]
MR2 is going to be API 13.
Change-Id: I05b65ace073b8731e85b41ac4ae63e2745cb46b5
Dianne Hackborn [Thu, 12 May 2011 22:16:33 +0000 (15:16 -0700)]
Fix build.
Change-Id: I97e357aa20c9ba91f20f77d53fc4dca1fd3aa598
Irfan Sheriff [Thu, 12 May 2011 21:18:03 +0000 (14:18 -0700)]
Merge "DO NOT MERGE Add DhcpStateMachine" into honeycomb-mr2
Irfan Sheriff [Thu, 12 May 2011 21:17:51 +0000 (14:17 -0700)]
Merge "DO NOT MERGE Define Protocol class" into honeycomb-mr2
Teng-Hui Zhu [Thu, 12 May 2011 21:11:25 +0000 (14:11 -0700)]
Merge "Fix the Uri parsing issue" into honeycomb-mr2
Irfan Sheriff [Fri, 6 May 2011 23:07:58 +0000 (16:07 -0700)]
DO NOT MERGE Add DhcpStateMachine
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: I5324814b19ff19863aa6fa89f1e3f0a202930c98
Teng-Hui Zhu [Wed, 11 May 2011 18:04:40 +0000 (11:04 -0700)]
Fix the Uri parsing issue
Switching back to use the setDataSource with Uri, which can handle both the
file and http path correctly.
Change-Id: I5bfc1d01a8de0a4f8640ffceafbc17984833097a
Dianne Hackborn [Thu, 12 May 2011 00:34:49 +0000 (17:34 -0700)]
New compat mode front end: UI and persistence.
Adds a really crappy UI for toggling compat mode.
Persists compat mode selection across boots.
Turns on compat mode by default for newly installed apps.
Change-Id: Idc83494397bd17c41450bc9e9a05e4386c509399
Scott Main [Thu, 12 May 2011 03:14:42 +0000 (20:14 -0700)]
docs: enforce alphanumeric strings for video id to prevent XSS
bug
4399806
Change-Id: Ie55a2b40687bb68e734012cecf22de62b4f4cf7e
Robert Ly [Wed, 11 May 2011 16:04:52 +0000 (09:04 -0700)]
am
a45e4f4d: doc change: adding link to pic board
* commit '
a45e4f4df59e4037408f6b9c0ddf4a7c57eaa273':
doc change: adding link to pic board
Robert Ly [Wed, 11 May 2011 03:54:05 +0000 (20:54 -0700)]
doc change: adding link to pic board
Change-Id: I1ac52d18285285f6e330265db15f103a473a26de
Eric Fischer [Tue, 10 May 2011 21:21:08 +0000 (14:21 -0700)]
am
37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
372592032a0e552ca30faadac9be823bd397910b':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 21:18:10 +0000 (14:18 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Tue, 10 May 2011 19:18:21 +0000 (12:18 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Joe Onorato [Tue, 10 May 2011 18:59:42 +0000 (11:59 -0700)]
Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2
Joe Onorato [Tue, 10 May 2011 18:58:22 +0000 (11:58 -0700)]
Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up
on large tablets.
Change-Id: I42d810a5b8e61b2959e30abef91477152495d39f
Dianne Hackborn [Tue, 10 May 2011 17:58:44 +0000 (10:58 -0700)]
Merge "Fix scaling of batched motion events." into honeycomb-mr2
Dirk Dougherty [Tue, 10 May 2011 07:34:09 +0000 (00:34 -0700)]
am
5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1
* commit '
5f8f0a0d40675bc4d373121ffdd22730f3701662':
Doc change: add Android 3.1 highlights and version notes.
Scott Main [Tue, 10 May 2011 07:34:06 +0000 (00:34 -0700)]
am
7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen supp
* commit '
7f3cf449fe1b90b902a37ddc3c05ec7aa236e584':
docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
Dirk Dougherty [Tue, 10 May 2011 05:58:37 +0000 (22:58 -0700)]
Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1
Dirk Dougherty [Fri, 25 Mar 2011 18:54:46 +0000 (11:54 -0700)]
Doc change: add Android 3.1 highlights and version notes.
Change-Id: Ifbc7df004d8aca9073d6397fad282a57ad4f1b74
Dianne Hackborn [Tue, 10 May 2011 04:19:26 +0000 (21:19 -0700)]
Fix scaling of batched motion events.
Change-Id: I1e070c936f7b2e8f1bb7ebae62b1df0aa6998b82
Scott Main [Tue, 10 May 2011 01:32:10 +0000 (18:32 -0700)]
Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5" into honeycomb-mr1
Dianne Hackborn [Tue, 10 May 2011 00:06:24 +0000 (17:06 -0700)]
Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2
Dianne Hackborn [Wed, 27 Apr 2011 22:52:56 +0000 (18:52 -0400)]
Better compat mode part one: start scaling windows.
First step of improving app screen size compatibility mode. When
running in compat mode, an application's windows are scaled up on
the screen rather than being small with 1:1 pixels.
Currently we scale the application to fill the entire screen, so
don't use an even pixel scaling. Though this may have some
negative impact on the appearance (it looks okay to me), it has a
big benefit of allowing us to now treat these apps as normal
full-screens apps and do the normal transition animations as you
move in and out and around in them.
This introduces fun stuff in the input system to take care of
modifying pointer coordinates to account for the app window
surface scaling. The input dispatcher is told about the scale
that is being applied to each window and, when there is one,
adjusts pointer events appropriately as they are being sent
to the transport.
Also modified is CompatibilityInfo, which has been greatly
simplified to not be so insane and incomprehendible. It is
now simple -- when constructed it determines if the given app
is compatible with the current screen size and density, and
that is that.
There are new APIs on ActivityManagerService to put applications
that we would traditionally consider compatible with larger screens
in compatibility mode. This is the start of a facility to have
a UI affordance for a user to switch apps in and out of
compatibility.
To test switching of modes, there is a new variation of the "am"
command to do this: am screen-compat [on|off] [package]
This mode switching has the fundamentals of restarting activities
when it is changed, though the state still needs to be persisted
and the overall mode switch cleaned up.
For the few small apps I have tested, things mostly seem to be
working well. I know of one problem with the text selection
handles being drawn at the wrong position because at some point
the window offset is being scaled incorrectly. There are
probably other similar issues around the interaction between
two windows because the different window coordinate spaces are
done in a hacky way instead of being formally integrated into
the window manager layout process.
Change-Id: Ie038e3746b448135117bd860859d74e360938557
Eric Fischer [Mon, 9 May 2011 23:51:24 +0000 (16:51 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I017caa112d687f53c1c3e65bb4bac71c25bf3b6f
Robert Ly [Mon, 9 May 2011 21:41:00 +0000 (14:41 -0700)]
am
c3038308: Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1
* commit '
c3038308a765de2826997b65c175bf752b45bc70':
Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
Robert Ly [Mon, 9 May 2011 21:25:53 +0000 (14:25 -0700)]
Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1
Robert Ly [Tue, 3 May 2011 08:47:09 +0000 (01:47 -0700)]
Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
Change-Id: I941e708a70b48dba2da4aa3d186824c89ebfb22f
The Android Automerger [Mon, 9 May 2011 05:11:52 +0000 (22:11 -0700)]
Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2
Scott Main [Wed, 9 Mar 2011 22:26:58 +0000 (14:26 -0800)]
docs: update screen support doc to de-emphasize support for 1.5
this includes a variety of other revisions to reorganize some of the content in the main document
and also add separate documents for how to enable screen filtering and add screen support on 1.5
For more change history, also see Change-Id: Iadebc9ca3f2f5a0e7490466811f0d741fe2b2b8c
Change-Id: I78825116f5f7825da42120e840e5bc6d8d1e359c
Scott Main [Sat, 7 May 2011 00:17:17 +0000 (17:17 -0700)]
docs: update sdk tools sums and sizes
based on candidate 5
Change-Id: I10929c0dfd889c919d70a4aaa4854ce1fecbc51d
Scott Main [Fri, 6 May 2011 21:29:59 +0000 (14:29 -0700)]
docs: update screens dashboard and add opengl dashboard
Change-Id: Ic810bc9bb2a917ef1489f3d5f6c30b1bb75cb2e1
Scott Main [Fri, 6 May 2011 23:38:02 +0000 (16:38 -0700)]
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
Change-Id: Ic721ff03aeea04f4a37d4256eea7f6d2b6dcd256
Irfan Sheriff [Thu, 28 Apr 2011 17:47:12 +0000 (10:47 -0700)]
DO NOT MERGE Define Protocol class
Adds a common namespace for communication across
different state machines
Change-Id: Ib6a29715c651371f91a950348a8525275b6026a0
Irfan Sheriff [Wed, 4 May 2011 21:16:44 +0000 (14:16 -0700)]
DO NOT MERGE Handle GET_POWER failures
Return a failure when GET_POWER returns a non-conforming
format
Bug:
4380317
Change-Id: Ie723c424ab07774f2be2594aa5deeaa5cd5ac280
Scott Main [Fri, 6 May 2011 16:53:29 +0000 (09:53 -0700)]
docs: de-new the dev guide toc
Change-Id: I11ab2fcb8472876aa0776383490390d502475e39
Scott Main [Fri, 6 May 2011 15:31:40 +0000 (08:31 -0700)]
Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
Scott Main [Fri, 6 May 2011 01:32:42 +0000 (18:32 -0700)]
Merge "docs: version notes for tools 11" into honeycomb-mr1
Scott Main [Fri, 6 May 2011 01:27:49 +0000 (18:27 -0700)]
docs: version notes for tools 11
Change-Id: Id33ba830b550d8d99b23f012501023b4675ba3eb
Scott Main [Fri, 6 May 2011 00:59:24 +0000 (17:59 -0700)]
Merge "docs: add package description for RTP" into honeycomb-mr1
Scott Main [Thu, 14 Apr 2011 22:45:08 +0000 (15:45 -0700)]
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
Change-Id: I4e301fe005d8fb4d04550b7db5afe2b63fe66802
Scott Main [Thu, 5 May 2011 23:17:40 +0000 (16:17 -0700)]
docs: add package description for RTP
Change-Id: I02c181a48101be288fb4aabf497f573f00038f90
Scott Main [Thu, 5 May 2011 22:53:44 +0000 (15:53 -0700)]
docs: add package description for mtp and a little more info to MtpDevice
Change-Id: I44b3926c4a286f624de525a7f0cc896879582bf5
Bill Gruber [Wed, 27 Apr 2011 18:20:54 +0000 (11:20 -0700)]
Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080
IAB docs: adds best practices for pending transaction UI
Change-Id: I9e27f3421e57b20c5b5961fc680fe89e3d5e865b
Scott Main [Thu, 5 May 2011 21:49:47 +0000 (14:49 -0700)]
update platform version number for docs
Change-Id: If0866ab1544ce0f5e70bbbe93d30ed27c4403406
Teng-Hui Zhu [Fri, 8 Apr 2011 00:13:18 +0000 (17:13 -0700)]
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
Scott Main [Thu, 5 May 2011 15:33:03 +0000 (08:33 -0700)]
Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
Robert Ly [Wed, 4 May 2011 23:55:59 +0000 (16:55 -0700)]
Merge "doc change: a misplaced link removed" into honeycomb-mr1
Robert Ly [Wed, 4 May 2011 23:41:40 +0000 (16:41 -0700)]
doc change: a misplaced link removed
Change-Id: If8b12e5409b44a095593b126a18fa6c0d572cc59
Katie McCormick [Fri, 29 Apr 2011 00:05:17 +0000 (17:05 -0700)]
Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
Change-Id: I9633f380f701bfa63453c9e969eeb0236a37894e
Scott Main [Mon, 2 May 2011 16:54:12 +0000 (09:54 -0700)]
cherrypick from honeycomb cl
742100b0ff66bb2a6fec706931e9cfeee8035ad3
docs: update dashboard for platform versions
Change-Id: I21ddf27d0ad5bba817f6995ae716c6dc1029c0a5
Scott Main [Wed, 4 May 2011 21:36:56 +0000 (14:36 -0700)]
docs: typo in menu doc
Change-Id: Ic67cce880406a7daeb98d37312dd34c6a681a7af
Scott Main [Wed, 4 May 2011 21:33:46 +0000 (14:33 -0700)]
docs: fix issue
4383086
Change-Id: I43fa88645b6b81102452d4a977ce5579275a2235
Scott Main [Mon, 2 May 2011 18:03:24 +0000 (11:03 -0700)]
docs: update homepage to announce 3.1
Change-Id: Ide4175f48b765484f0a1bbb5be3bc56e79e97612
Robert Ly [Wed, 4 May 2011 20:10:54 +0000 (13:10 -0700)]
Merge "adding the usb apis to the resources browser" into honeycomb-mr1
Robert Ly [Wed, 4 May 2011 19:18:09 +0000 (12:18 -0700)]
Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1
Mike Lockwood [Mon, 2 May 2011 22:51:11 +0000 (18:51 -0400)]
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>
Mike Lockwood [Mon, 2 May 2011 21:01:47 +0000 (17:01 -0400)]
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>
Mike Lockwood [Mon, 25 Apr 2011 01:40:17 +0000 (18:40 -0700)]
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>
Mike Lockwood [Mon, 25 Apr 2011 19:56:21 +0000 (12:56 -0700)]
DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
Change-Id: Ie0b979b5cfd9b5f9e9196c5f8c8ecccef6ed84c3
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Fri, 22 Apr 2011 00:05:55 +0000 (17:05 -0700)]
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>
Mike Lockwood [Sun, 24 Apr 2011 18:15:09 +0000 (11:15 -0700)]
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>
Marco Nelissen [Tue, 29 Mar 2011 20:29:42 +0000 (13:29 -0700)]
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: I25652a031b98d2ec2433263dd6f344ba90d2d112
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Fri, 22 Apr 2011 14:05:21 +0000 (07:05 -0700)]
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: I0b139a0f3b369c1080831a5b3a48f5d9a330b1bb
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Tue, 5 Apr 2011 14:21:27 +0000 (10:21 -0400)]
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: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Tue, 5 Apr 2011 14:21:51 +0000 (10:21 -0400)]
DO NOT MERGE MountService: Fix running media scanner at boot.
Change-Id: I67ff2ccde7e03143167b8c59726ffb741c96e028
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Tue, 5 Apr 2011 14:05:47 +0000 (10:05 -0400)]
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: Ic9836c2e1e8a5677d0c4e33476a72081f69823a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Thu, 24 Mar 2011 15:12:30 +0000 (08:12 -0700)]
DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
Change-Id: I43d5c1730b340f1288b58012234b38f801001b71
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Wed, 23 Mar 2011 18:52:34 +0000 (14:52 -0400)]
DO NOT MERGE MountService: Add support for multiple volumes
Change-Id: I45ee0e5735a6d72c635f6d22320e8b13bccc3847
Signed-off-by: Mike Lockwood <lockwood@android.com>
Robert Ly [Tue, 3 May 2011 23:54:21 +0000 (16:54 -0700)]
Merge "Doc change: fixing minor bug for xml resources bug
4376713" into honeycomb-mr1
Robert Ly [Tue, 3 May 2011 23:47:21 +0000 (16:47 -0700)]
Doc change: fixing minor bug for xml resources
bug
4376713
Change-Id: I4c969810eaaf053f8326721b71fbe494b542082d
Glenn Kasten [Tue, 3 May 2011 23:46:12 +0000 (16:46 -0700)]
Merge "Account for race condition when attaching HDMI." into honeycomb-mr1
Robert Ly [Mon, 18 Apr 2011 17:18:30 +0000 (10:18 -0700)]
Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL
Change-Id: Ib6a5c3a958a77f5ef9322fb79b2da19763ec364d
Robert Ly [Tue, 3 May 2011 00:49:05 +0000 (17:49 -0700)]
adding the usb apis to the resources browser
Change-Id: I79e9f93ebfa3aaf03e4f4deeb70d6c5a7a4ad07f
Dan Morrill [Mon, 2 May 2011 20:16:06 +0000 (13:16 -0700)]
Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change
since file was renamed, making cherry-pick impossible.
Change-Id: Idc802af57fb9926a69ed52d4e776ef57d8b647c6
Scott Main [Fri, 29 Apr 2011 21:55:43 +0000 (14:55 -0700)]
am
1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '
1462813a28270d4255f9542b666960182e274a6e':
docs: more documentation for ProgressBar
Scott Main [Fri, 29 Apr 2011 21:52:20 +0000 (14:52 -0700)]
Merge "docs: more documentation for ProgressBar" into honeycomb
Scott Main [Fri, 29 Apr 2011 17:31:10 +0000 (10:31 -0700)]
docs: more documentation for ProgressBar
Change-Id: Ief415c0b22da3e7d4ea318e321edc7d215603f0f
Scott Main [Fri, 29 Apr 2011 21:42:55 +0000 (14:42 -0700)]
am
c7eb47fa: docs: tweak table headers for config qualifiers
* commit '
c7eb47fad4fe39bd85c6205e38426c1867b9ed92':
docs: tweak table headers for config qualifiers
Scott Main [Fri, 29 Apr 2011 21:12:24 +0000 (14:12 -0700)]
docs: tweak table headers for config qualifiers
Change-Id: Idc8d48f1db9b6b87372a49095b034edff9baecfa
Eric Fischer [Fri, 29 Apr 2011 20:58:45 +0000 (13:58 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: If18189bb816828187274ff5a1ed122767decc817
James Dong [Thu, 28 Apr 2011 18:15:01 +0000 (11:15 -0700)]
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