6406 Commits

Author SHA1 Message Date
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
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
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
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
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
Jean-Baptiste Queru
d2388b50a5 am 53ad027c: Merge "MtpStorage: correct the size of reserve space for MTP"
* commit '53ad027c46bf578e26e5db70319b17a671ce8a36':
  MtpStorage: correct the size of reserve space for MTP
2012-08-10 09:26:47 -07:00
Jean-Baptiste Queru
53ad027c46 Merge "MtpStorage: correct the size of reserve space for MTP" 2012-08-10 09:03:42 -07:00
Jean-Baptiste Queru
6736cca08d am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately"
* commit '52410be8ec092bfa7e84f2d8facdc161d6107ac3':
  mediacodec: Don't suggest calling getOutputFormat() immediately
2012-08-08 13:08:21 -07:00
bo huang
3b60dacb4e MtpStorage: correct the size of reserve space for MTP
According to description in frameworks/base/core/res/res/xml/storage_list.xml,
"mtpReserve: (integer) number of megabytes of storage MTP should reserve for free storage".
Mtpstorage class use it directly and doesn't change it to correct size in megabyes.
Mtp initor can not get correct storage information from android.

Change-Id: Icf59eb1eb478e67ea5990be96a9decb41aa55504
Signed-off-by: Bo Huang <bo.b.huang@intel.com>
Signed-off-by: Jack Ren<jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-08-07 13:02:59 +08:00
Jeff Smith
71930dd77e am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214
* commit 'a45746efadd11bb7dfab026fb3c81a25fae74ca4':
  Fix several cases of broken droiddoc syntax external issue 35214
2012-07-25 10:56:03 -07:00
Jeff Smith
a45746efad Fix several cases of broken droiddoc syntax
external issue 35214

patch contributed by Jeff Smith <whydoubt@yahoo.com>

Change-Id: I70dcee88a140699bf3e1ab369bed6dcd2fdd3d83
2012-07-25 10:49:25 -07:00
James Dong
d1a0a53eec am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev
* commit '5d478b9c1009b077649f7f870d993832d380d63c':
  Changed to obtain a parcel in each notify() call in jni.
2012-07-18 20:15:11 -07:00
James Dong
5d478b9c10 Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev 2012-07-18 18:43:37 -07:00
Adam Powell
c36b8acd1e am 38895394: Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev
* commit '388953942b536b5eebd942ef78ae5b7499bc2078':
  Properly switch MediaRouter to wired audio over a2dp.
2012-07-16 17:33:40 -07:00
Martin Storsjo
fdd3241a24 mediacodec: Don't suggest calling getOutputFormat() immediately
Calling getOutputFormat() at this point currently crashes in
native code. (After a fix to the native code, this gives an
IllegalStateException instead.)

Change-Id: Ia45c4820bb3d9ed435a0aeef1ff8c230524f2e1f
2012-07-13 14:10:21 +03:00
Adam Powell
bcf21e913a Properly switch MediaRouter to wired audio over a2dp.
The system gives priority to physically connected
headphones/speakers/docks/etc. Reflect this in MediaRouter and
associated UI.

Bug 6777592

Change-Id: Ibabf3d7512207117e892c99f004443490c3d0612
2012-07-12 16:53:04 -07:00
Yu Shan Emily Lau
413b5c19a6 am 10366b93: Merge "Remove the unnecssary intent call." into jb-dev
* commit '10366b93157718ed8621f5af087e7a771191b41a':
  Remove the unnecssary intent call.
2012-07-10 16:49:31 -07:00
Yu Shan Emily Lau
10366b9315 Merge "Remove the unnecssary intent call." into jb-dev 2012-07-10 16:47:09 -07:00
Yu Shan Emily Lau
e60393ae71 Remove the unnecssary intent call.
Change-Id: Ia0a460ca8532ccb2f4b0f0205d192b1ba907b5b6
2012-07-10 16:45:38 -07:00
Insun Kang
333c09945e Changed to obtain a parcel in each notify() call in jni.
Change-Id: I5faf0f5d1fdf76a5b4bd1cff37aa58df79d18e85
related-to-bug: 6785452
2012-07-10 22:23:01 +09:00
Scott Main
7b5488d85d am 099fd80f: docs: add throws notice for isPlaying per external issue 33610
* commit '099fd80f984b8493de58bdda8ea05563261b0af2':
  docs: add throws notice for isPlaying per external issue 33610
2012-07-03 17:39:25 -07:00
Scott Main
099fd80f98 docs: add throws notice for isPlaying
per external issue 33610

Change-Id: Ibd778cb4ecc5f1717fa007ac069a7b3660ec4794
2012-07-03 17:32:23 -07:00
Scott Main
00a82605a1 am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev
* commit 'f443c5ea2c67285322d4790e5bee4c3c6f6af1ae':
  Minor corrections to the javadoc overview to reflect late API changes.
2012-06-28 12:04:04 -07:00
Scott Main
f443c5ea2c Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev 2012-06-28 12:00:49 -07:00
Andreas Huber
2ac3f2e285 Minor corrections to the javadoc overview to reflect late API changes.
Change-Id: If64e7ea0fa9c892d728282e5e18547a4da115989
2012-06-27 11:46:21 -07:00
Mike Lockwood
1524e62506 am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev
* commit '7017d51e147a0f6ed2370fb79c656c9726304131':
  MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
2012-06-26 16:59:07 -07:00
Mike Lockwood
7017d51e14 Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev 2012-06-26 16:57:02 -07:00
Mike Lockwood
1e855d98aa MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
Bug: 6684451

Change-Id: I90204550ccfcd1b7a5b1973bed2a88e934aae053
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-06-26 16:33:05 -07:00
Andreas Huber
6dfd6aec27 am c8c5e98b: Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev
* commit 'c8c5e98b9ea0be4d161382fc537955d505e65a6c':
  Document some of the more common mimetypes to be used when instantiating
2012-06-25 14:53:07 -07:00
Andreas Huber
68b1a6eed8 Document some of the more common mimetypes to be used when instantiating
MediaCodec components.

Change-Id: I810507d1d76a28666eb6fb63e3b597d38e5f1389
2012-06-25 14:38:16 -07:00
Adam Powell
3c419da632 am dbbfa702: Fix MediaRouter bugs
* commit 'dbbfa702a09f6d2d36dee1b552442d04a4673f89':
  Fix MediaRouter bugs
2012-06-24 14:56:06 -07:00
Adam Powell
dbbfa702a0 Fix MediaRouter bugs
Fix a bug where a newly added group had no supported types at the time
of callback dispatch, meaning that no registered callbacks would be
invoked.

Fix a bug where subscribed type flags were not updated properly when
re-adding a callback for new types.

Change-Id: I7d9f11b363ebdca692786cec1d432600946e5721
2012-06-24 14:32:04 -07:00
Adam Powell
3b939b7242 am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev
* commit 'fd3fd482ab6ab67b687696f51fa67714bd36fa49':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
2012-06-23 05:36:54 -07:00
Adam Powell
f3b653a21c Update route count properly when MediaRouteButton detects
grouped/ungrouped events

Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe
2012-06-22 19:22:38 -07:00
Adam Powell
fd7ea06787 am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-dev
* commit 'd7c00d2bdd011d3a73faf1c4a5bb8012d24dd648':
  MediaRouter group volume reporting
2012-06-21 11:52:19 -07:00
Adam Powell
f8ac14a7f5 MediaRouter group volume reporting
RouteGroups always report back the loudest volume of their component
routes. Maintain this through volume update requests (such as those
reported by volume hard keys) such that each route updates
individually, but the group slider always indicates the loudest value.

Change-Id: I5de4b9048bf55682b6271e9485fe50496a1c97c2
2012-06-20 23:59:14 -07:00
Adam Powell
ed044cda8f am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev
* commit '09829b71de3a84cb9d1bc0d8aad78dd16daadddf':
  Expand volume APIs for MediaRouter
2012-06-20 22:35:44 -07:00
Adam Powell
09829b71de Merge "Expand volume APIs for MediaRouter" into jb-dev 2012-06-20 22:32:39 -07:00
Pannag Sanketi
4bae6149bd am 60c5b714: Merge "Crash in SurfaceTextureTarget filter open" into jb-dev
* commit '60c5b714dc747eef0b5c2a57db60b162315fba2f':
  Crash in SurfaceTextureTarget filter open
2012-06-20 22:31:12 -07:00
Adam Powell
8e37a85bf3 Expand volume APIs for MediaRouter
Allow applications to set a requested volume level on RouteInfo
objects. If requested for a user route, the app-supplied callback will
be invoked to perform actual volume adjustment.

Change-Id: I856990a0da7292492aa15e6562dbc3d055b848a0
2012-06-20 22:19:29 -07:00
Pannag Sanketi
60c5b714dc Merge "Crash in SurfaceTextureTarget filter open" into jb-dev 2012-06-20 19:32:44 -07:00
Pannag Sanketi
22f2a8728e Crash in SurfaceTextureTarget filter open
If the filter graph in an app closes out, the SurfaceTextureTarget
filter was losing the reference to the original surfacetexture, and the
app would re-start the graph without setting the surfacetexture again,
thus leading to a crash in registering a surface from surfacetexture.

Typical scenarios is start/stop immediately in camera effects recording.

Fix part of b/6651352
Fix part of b/6655597

Change-Id: Ib2bae7e886784e91b3a886f7ccd439ff190feb22
2012-06-20 19:23:48 -07:00
Jean-Michel Trivi
e44440f40c am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev
* commit 'bd6b1820d931ef11fc7fc5b8571a8265c1ed4994':
  Unhide new API in android.media.MediaRouter for remote playback
2012-06-20 16:43:55 -07:00
Jean-Michel Trivi
7fe75d9759 am fc178e38: Merge "Asynchronous handling of remote volume updates" into jb-dev
* commit 'fc178e381d3db299901a96461122eb22a4ffb43e':
  Asynchronous handling of remote volume updates
2012-06-20 16:43:52 -07:00
Jean-Michel Trivi
2cd5d25378 Unhide new API in android.media.MediaRouter for remote playback
Expose new functionality for handling remote volume in:
 android.media.MediaRouter.RouteInfo
 android.media.MediaRouter.UserRouteInfo
 android.media.MediaRouter.VolumeCallback

Change-Id: I8fd9c92be606364599e65939f318e11c2860bab9
2012-06-20 14:36:23 -07:00