drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,967 Commits 1 Branch 0 Tags
Commit Graph

46967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marco Nelissen
1cf74fb3c4 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>
 2011-05-03 21:03:56 -04:00
Mike Lockwood
f60ba87f07 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>
 2011-05-03 21:03:56 -04:00
Mike Lockwood
7ae938be1b 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>
 2011-05-03 21:03:56 -04:00
Mike Lockwood
91dd02c340 DO NOT MERGE MountService: Fix running media scanner at boot. 
Change-Id: I67ff2ccde7e03143167b8c59726ffb741c96e028
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-03 21:03:56 -04:00
Mike Lockwood
b9135638c5 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>
 2011-05-03 21:03:56 -04:00
Mike Lockwood
d967f4664f DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
Change-Id: I43d5c1730b340f1288b58012234b38f801001b71
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-03 21:03:55 -04:00
Mike Lockwood
f097fc2fee DO NOT MERGE MountService: Add support for multiple volumes 
Change-Id: I45ee0e5735a6d72c635f6d22320e8b13bccc3847
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-03 21:03:55 -04: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
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
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
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
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
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
Stephen Hines
00df8e230e Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1 2011-04-27 17:32:40 -07:00
Alex Sakhartchouk
4658d779e3 Check setName() for null string + fix rsRand(). 
Change-Id: I5e0042930209861e2eb9acc91380e9473dac0997
 2011-04-27 13:30:43 -07:00
Gloria Wang
83ddcdf7fd Add heartbeat error codes into MediaErrors.h 
related-to-bug: 4322415

Change-Id: I78137c61e3a8ce9afcb9fb38cb77a83561b9b72d
 2011-04-26 19:35:32 -07:00
Joe Fernandez
983cb86388 docs: fix for Misdirected link in topic Declaring Layout 
bug 4257430

Change-Id: Id4711c712e99eea1dd537ee2343aedc5014df536
 2011-04-26 15:47:39 -07:00
Daniel Sandler
e97528ee9e Account for race condition when attaching HDMI. 
The status bar figures out how tall it needs to be by
subtracting 720 (for 720p HDMI output) from the display
height. However, if the display is in the process of
rotating to portrait when HDMI is attached (or for whatever
other reason dispatches the HDMI_PLUGGED_STATE before the
display has been rotated to landscape) this computation will
be wrong.

The quick fix is to compute the status bar height as
shortSide - 720 rather than height - 720.

Bug: 4284690
Change-Id: I3715264a9e32af1299777ccdbdc22ca60926cc79
 2011-04-26 13:54:37 -04:00
Scott Main
e1e3d7d97c am 97fee855: docs: update a couple usb driver URLs bug: 4339758 
* commit '97fee8554d40a8c093ef16934284d9292e4cf7a4':
  docs: update a couple usb driver URLs bug: 4339758
 2011-04-26 00:45:35 -07:00
Scott Main
97fee8554d docs: update a couple usb driver URLs 
bug: 4339758

Change-Id: I39357a0061312b189f50c296105cefe3862fc733
 2011-04-25 14:53:03 -07:00
Eric Laurent
223995dcf2 Fix issue 4335692: HDMI media volume 
Forced music stream volume to max when not muted and output device is HDMI.

Change-Id: Ibd287cea8ae1d3f36fea6651a113bd5cf2dbad13
 2011-04-25 13:34:51 -07:00
Joe Fernandez
c84362a72a am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013 
* commit 'a29e2cca5d0e3ff222c09165fd69ca8f4d0f634e':
  docs: Fixing Issue with code for Adding Tabs topic bug 4293013
 2011-04-22 16:36:33 -07:00
Joe Fernandez
a29e2cca5d docs: Fixing Issue with code for Adding Tabs topic 
bug 4293013

Change-Id: Ia08fe8ae0112af5157607e4fcd07773a945473f3
 2011-04-22 16:22:48 -07:00
Scott Main
caf60ebdbd am 48c187f9: docs: fix typo in 3.0 notes 
* commit '48c187f9cf2bcb51f446a5a62346f9ef5920c7f3':
  docs: fix typo in 3.0 notes
 2011-04-21 17:36:40 -07:00
Scott Main
48c187f9cf docs: fix typo in 3.0 notes 
Change-Id: I0925a21b5eb53811736cfe04498917371c8bb67c
 2011-04-21 17:22:54 -07:00
Scott Main
ca7f30ebb2 am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb 
* commit 'b8a57841316171d6db4311a65914720213516153':
  docs: add a little info to Configuration class description
 2011-04-21 10:53:08 -07:00
Scott Main
b8a5784131 Merge "docs: add a little info to Configuration class description" into honeycomb 2011-04-21 10:51:14 -07:00
Scott Main
1ccfd8ed7d am d155e1a2: docs: change ZTE usb driver link 
* commit 'd155e1a2d8768e383824c565a5b4f5a7546960ea':
  docs: change ZTE usb driver link
 2011-04-21 10:08:20 -07:00
Scott Main
d155e1a2d8 docs: change ZTE usb driver link 
Change-Id: I8a7528094a565f846ceca456787de81c81ee39c9
 2011-04-21 09:57:55 -07:00
Scott Main
63848e3df3 docs: add a little info to Configuration class description 
Change-Id: I3278759bd1c323330c1143ef71d0644872caa085
 2011-04-20 22:20:46 -07:00
Scott Main
1f07f1257b am 6669f251: docs: fix snippet errors in web doc 
* commit '6669f251391d7e61a6ea55e2538c941f82514dd9':
  docs: fix snippet errors in web doc
 2011-04-15 18:03:14 -07:00
Scott Main
6669f25139 docs: fix snippet errors in web doc 
Change-Id: I65648136c2df4bde5fa3bc3495f5166c4c87fe8a
 2011-04-15 17:55:33 -07:00
Dianne Hackborn
f6f87c9859 Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1 2011-04-14 15:10:31 -07:00
Eric Fischer
4e3d6aa068 am d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'd284a8676e002a72b66d321402ec7f4ed61c7915':
  Import revised translations.  DO NOT MERGE
 2011-04-14 14:21:57 -07:00
Eric Fischer
d284a8676e Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-04-14 14:14:46 -07:00
Eric Fischer
b5b49ba8fc Import revised translations. DO NOT MERGE 
Change-Id: I796dc2ad1556201f3b443b8185f5280cc8e1e213
 2011-04-14 13:59:43 -07:00
Scott Main
2a08e7bf67 am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs 
* commit 'd08debcb211ec2e369c8c88ce15e4aaadd54a8d4':
  docs: bring back the SDK EULA wall for downloading archived SDKs
 2011-04-14 13:55:16 -07:00
Dianne Hackborn
52b0ce0fe3 Fix issue #4291805: Tap Fish crashes on launch 
The activity manager got a little too aggressive about argument validation.

Change-Id: I3cca0cd3135b98e5c50d26db778ec4ec28a47ec1
 2011-04-14 13:09:32 -07:00
Scott Main
d08debcb21 docs: bring back the SDK EULA wall for downloading archived SDKs 
Change-Id: Ieccd0d03ca49a68d7d4956aa4991d8a73ffff674
 2011-04-14 12:31:17 -07:00
Xia Wang
46b59ef01b Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1 2011-04-13 15:13:10 -07:00
Glenn Kasten
b0d6f10eed Bug 4167061 remove debugging code 
Change-Id: I1cb46a7bbf885c72e75d32f3f7675d90ab611e85
 2011-04-13 11:16:49 -07:00
Scott Main
7e8902a905 am f42937a8: docs: fix doc typo 
* commit 'f42937a8aa0af6b22d8a2a43a9bfc07c38aeffb5':
  docs: fix doc typo
 2011-04-12 14:44:02 -07:00
Scott Main
f42937a8aa docs: fix doc typo 
Change-Id: Ia5c32723489a045d865307dbad41edb29b2cfb29
 2011-04-12 14:38:54 -07:00