6653 Commits

Author SHA1 Message Date
Mike Lockwood
465d72073c am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit 'ad23333f728471a7f2c49cd1c9575f1cea2503f6':
  MtpData bmp format file can't recognize when copy bmp into DUT
2012-09-18 11:01:32 -07:00
Mike Lockwood
945080b5b6 am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit '1e86994cd0e13f9084d3f4bd0060b9e34c935490':
  MtpData bmp format file can't recognize when copy bmp into DUT
2012-09-18 10:53:11 -07:00
Mike Lockwood
1e86994cd0 Merge "MtpData bmp format file can't recognize when copy bmp into DUT" 2012-09-18 10:25:42 -07:00
Marco Nelissen
c5a6cdeb14 Merge "Visualizer only works on sounds >5 sec." into jb-mr1-dev 2012-09-18 09:44:56 -07:00
Marco Nelissen
af68e7c5f5 Visualizer only works on sounds >5 sec.
Various media framework tests use a Visualizer to look at the output
of another effect, but this requires the played file  to be longer
than 5 seconds.
b/4571740
b/7173543
b/7173545
b/7175623

Change-Id: I066a737542bb50e7245fef99f9e11ae8f2aadd6c
2012-09-18 09:19:55 -07:00
Marco Nelissen
4dff2ab52b Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-dev 2012-09-18 07:58:37 -07:00
Marco Nelissen
c7fb118d90 Activity.onStop(Bundle) does not exist
Since that method doesn't exist, the MediaFrameworkTest wake lock was
never released, which caused the test to be killed when the GC collected
the still active wake lock.

Change-Id: Iee2c0478470be987ade405a45abf42ca61b681ab
2012-09-17 17:03:30 -07:00
Glenn Kasten
228c9847a3 New API for querying audio properties
Bug: 6635041
Change-Id: I66e87c75af7c84cdb23cb25a958e79bba8e53baa
2012-09-17 08:54:11 -07:00
Eric Laurent
c34dcc1e1e headphone volume limitation
Limit music volume when headphones or headset are inserted.
Display warning message when user wants to increase the volume
above a platform specific volume and request user acknowledgement
before proceeding.

TODO: exact wording of the warning message must be defined by UX.

Change-Id: I00f429f602534c6d8783126b929371c4d432e6e2
2012-09-16 17:44:45 -07:00
Ruei-sung Lin
51e67a0a74 Merge "Fix b/7087723 Patch leftover after tapping the red eye area" into jb-mr1-dev 2012-09-12 17:22:09 -07:00
Mike Lockwood
3ddaace1a2 Merge "MtpDatabase: Use actual file size instead of media database size column" into jb-mr1-dev 2012-09-12 16:31:56 -07:00
Mike Lockwood
f6f1661457 MtpDatabase: Use actual file size instead of media database size column
Fixes problems with file transfer from device to host that can occur
if the database size value is wrong.

Bug: 6954446

Change-Id: I03c3dd4b75267d1f4613f0b588c8899ded9a70be
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-09-12 15:50:59 -07:00
Ruei-sung Lin
c733a79a43 Fix b/7087723 Patch leftover after tapping the red eye area
Change-Id: I06f5c491b09cf13698f001e8b11f42506fda5bbd
2012-09-12 15:01:29 -07:00
Marco Nelissen
a962d749ed Merge "EffectsTest enhancements" into jb-mr1-dev 2012-09-12 10:25:53 -07:00
Marco Nelissen
80cd3fcd5c EffectsTest enhancements
Fix the session edit boxes, and make the effects list more readable
by translating known effect type UUIDs

Change-Id: I67e78d8d2781c5a56fa35d994bc21911d15f8715
2012-09-11 13:47:16 -07:00
Mike Lockwood
25da9375fd Merge "MtpDatabase: Fix typo affecting parent and format queries" into jb-mr1-dev 2012-09-11 10:57:41 -07:00
Mike Lockwood
58e6831ccb MtpDatabase: Fix typo affecting parent and format queries
Bug: 7114350

Change-Id: I80269cfcebf521ea13cae30c1c9bd477d76adbd1
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-09-11 10:49:34 -07:00
Jean-Michel Trivi
2ac2afeac9 Add support for controlling remote submix audio routing
Add method in AudioManager to control remote submix through
  AudioService.
AudioService controls remote submxi: enabling/disabling
 remote submix will:
 - make the sink audio device available/unavailable
 - make the audio source available/unavailable
 - force/unforce media streams to be routed to WFD

Change-Id: I05d9cc7c3e8a720318ec1385737cbd46a21a3207
2012-09-10 12:29:09 -07:00
Jeff Brown
7017e48380 Merge "Add support for Wifi display." into jb-mr1-dev 2012-09-07 16:00:13 -07:00
Jeff Brown
cbad976b2a Add support for Wifi display.
Change-Id: I99693786cf9d07d07d3400046c55eb4933730b80
2012-09-07 13:26:31 -07:00
Eric Laurent
53082eced9 AudioSystem: new audio device enums
Update audio device enums to match new definitions in
native framework.

Change-Id: Ie257ab0423e3567f4af5a02b03e128af6c714da6
2012-09-07 10:41:03 -07:00
Mike Dodd
37ee53420c Merge "Add context support to backdropper filter." into jb-mr1-dev 2012-09-07 08:43:36 -07:00
Mike Dodd
f330d19a17 Add context support to backdropper filter.
Part of b/7028438

Change-Id: Idcae38b452abc847c7b869a5568d1c5d831411b7
2012-09-06 17:00:38 -07:00
Marco Nelissen
2e2beaaee2 Audio Effects test app
Change-Id: I93fff0e195af3205207ade32ab31f2a760574c7f
2012-09-06 12:37:30 -07:00
Jean-Baptiste Queru
c67fb6c39e am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."
* commit '657dba9e66ff02785c2bf034ebecc3c357cbc333':
  Musicplayer application can not display DRM files of internal storage.
2012-09-06 09:18:20 -07:00
Jean-Baptiste Queru
4aa83ec3ee am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."
* commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c':
  Musicplayer application can not display DRM files of internal storage.
2012-09-06 09:12:17 -07:00
Jan Bjernler
20c38ea9fd Musicplayer application can not display DRM files of internal storage.
Make DRM-protected files transferred over MTP be detected.
Previously it was inserted into the database as MEDIA_TYPE_NONE,
the result of this was that the file was not detected properly.
With this fix the file is scanned from the beginning.

Change-Id: Idf17d39e3d529394cd4a03d71fb250e69b395533
2012-08-31 11:51:38 +02:00
Johan Redestig
c3ea477e21 Removed offensive music genre
The genre is a bad joke, not a real thing.

See http://en.wikipedia.org/wiki/Negerpunk

Change-Id: I073c89e286ef4b8f9d678e1b137c657b26066099
2012-08-31 10:47:26 +02:00
Dianne Hackborn
73365695e4 Merge "Improve multi-user broadcasts." into jb-mr1-dev 2012-08-30 14:56:11 -07:00
Teng-Hui Zhu
4dc187b43a Merge "Fix a typo in the sample code" into jb-mr1-dev 2012-08-30 14:54:24 -07:00
Teng-Hui Zhu
a242deb1de Fix a typo in the sample code
Change-Id: I27ee1b0ef8abf5decefae1ec1706a9f142016344
2012-08-30 14:36:58 -07:00
Dianne Hackborn
5ac72a2959 Improve multi-user broadcasts.
You can now use ALL and CURRENT when sending broadcasts, to specify
where the broadcast goes.

Sticky broadcasts are now correctly separated per user, and registered
receivers are filtered based on the requested target user.

New Context APIs for more kinds of sending broadcasts as users.

Updating a bunch of system code that sends broadcasts to explicitly
specify which user the broadcast goes to.

Made a single version of the code for interpreting the requested
target user ID that all entries to activity manager (start activity,
send broadcast, start service) use.

Change-Id: Ie29f02dd5242ef8c8fa56c54593a315cd2574e1c
2012-08-30 14:33:22 -07:00
Eric Laurent
794da7a054 AudioService: pause music when undocked
Send becomming noisy event also when disconnecting a dock
(analog, digital or USB) or HDMI.

Bug 6760590.

Change-Id: I497df35a3c6817d2b300f532d4cc3f12e3ce9ace
2012-08-30 11:30:16 -07:00
Jeff Brown
dc7d8008ec Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev 2012-08-27 17:16:53 -07:00
Jeff Brown
64a55af0ac Add plumbing for new surface flinger display API.
Cleaned up the implementation of Surface and SurfaceSession
to use more consistent naming and structure.

Added JNI for all of the new surface flinger display API calls.

Enforced the requirement that all Surfaces created by
the window manager be named.

Updated the display manager service to use the new methods.

Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
2012-08-27 14:34:54 -07:00
Jean-Baptiste Queru
c77c6898b3 am 3221b333: am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"
* commit '3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a':
  Make setCaptureRate locale safe
2012-08-27 13:10:57 -07:00
Jean-Baptiste Queru
3221b33322 am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"
* commit '26ad1e7874f3151ec331e142fdcb8b3a22ddc26a':
  Make setCaptureRate locale safe
2012-08-27 11:29:29 -07:00
Johan Redestig
1c7928e8c6 Make setCaptureRate locale safe
Dont use the default String.format in setCaptureRate as it is both
locale unsafe and less efficient than regular string concatenation
in this case.

Change-Id: I29418ec0352ef8c79967592b6eb8ff66cc9c99f0
2012-08-27 14:24:10 +02:00
James Dong
2adac496a8 Added some common error codes in MediaPlayer.java
o related-to-bug: 6770717

Change-Id: Iea8ba6943755a9af8df5b6e91284c7c1b32c3c6c
2012-08-26 14:15:57 -07:00
Marco Nelissen
c209a06cfd Let apps provide a custom data source for extractors
Adds android.media.DataSource, which is modeled after its native namesake,
and a new method on MediaExtractor that lets apps specify their implementation
of a DataSource as the source of data for the extractor.

Change-Id: If1b169bd18d2691ebc4f8996494dfc8ee0894b6c
2012-08-24 10:36:51 -07:00
Teng-Hui Zhu
2253eeab6c Add context support into the filter framework.
Basically we need the context to pass the content URI into MediaPlayer.
bug:6837809

Change-Id: I9390b57baff06f80246584fb3a4b746e1a308ff2
2012-08-21 14:17:02 -07:00
Jean-Baptiste Queru
1abb7b5415 am f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"
* commit 'f96fcd5095e751fc9402d8bbecdf59f53e00d854':
  To avoid the JNI memory leaks in video editor codes
2012-08-20 15:26:53 -07:00
Jean-Baptiste Queru
f96fcd5095 am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"
* commit '26f8ce83e04c4efd10c09bb83cfacdcd154d9450':
  To avoid the JNI memory leaks in video editor codes
2012-08-20 14:50:45 -07:00
bo huang
240582eabe MtpData bmp format file can't recognize when copy bmp into DUT
add support for bmp format.

Change-Id: I67d4703b43cd32abad638bae57bbceb65b4be6de
Author: bo huang <bo.b.huang@intel.com>
Signed-off-by: bo huang <bo.b.huang@intel.com>
Signed-off-by: Wu, Hao <hao.wu@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 24555
2012-08-17 10:28:51 +08:00
wfeng6
c96a7294a4 To avoid the JNI memory leaks in video editor codes
There is a protential memory leak in video editor JNI codes.
When importing so many video clips, the number of local reference
will exceed 512, which will cause the Dalvik virtual machine
crash. The patch will free each local reference when it's no
longer used to avoid memory leaks.

Change-Id: Iecd986c83f05a1103641746d6d43eef0a9c5ee40
Author: Wei Feng <wei.feng@intel.com>
Signed-off-by: Wei Feng <wei.feng@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 40786
2012-08-17 10:22:57 +08:00
Jean-Baptiste Queru
97fb26c838 am b18bcf13: am d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"
* commit 'b18bcf13fd47102a2527e599cde0b1d59ab7c51e':
  Fix Issue #35489: drm content corruption on GB
2012-08-16 15:32:55 -07:00
Jean-Baptiste Queru
b18bcf13fd am d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"
* commit 'd2fb6e99bda1ae607b5dfbb68905030f2133f8e8':
  Fix Issue #35489: drm content corruption on GB
2012-08-16 15:29:47 -07:00
git-you.kim72.gmail.com
fd20296c27 Fix Issue #35489: drm content corruption on GB
If rawContent is copied into mediaBuf, readBuf is copied to wrong address.
mediaBuf should be forwarded by readBytes.

Change-Id: I4fc9c1f7f4e3d5dfe3c7e5cd92261608f6b3e248
Signed-off-by: git-you.kim72.gmail.com <you.kim72@gmail.com>
2012-08-13 15:03:48 -07:00
Jean-Baptiste Queru
0bf666a875 am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that does not exist"
* commit '4da3769d30851f0b517a688a5c835715d7d0b0bf':
  mediacodec: Don't crash if trying to open a codec that does not exist
2012-08-13 09:48:24 -07:00
Martin Storsjo
e68323325b mediacodec: Don't crash if trying to open a codec that does not exist
Change-Id: If75e3156517993629f50622a84a9ac573fced815
2012-08-13 08:47:01 -07:00