6803 Commits

Author SHA1 Message Date
Jean-Michel Trivi
c1059ca337 am a2bb9327: am 7c8aeadd: Merge "Support multiple IRemoteControlDisplay" into jb-mr2-dev
* commit 'a2bb93273481f8d7633c993c22e8a31ab5930c22':
  Support multiple IRemoteControlDisplay
2013-03-12 16:45:48 +00:00
Jean-Michel Trivi
7c8aeadd9a Merge "Support multiple IRemoteControlDisplay" into jb-mr2-dev 2013-03-12 16:40:22 +00:00
Eric Laurent
bb709246f3 am 94a731fa: am 5ef14b25: Merge "audio service: fix BT SCO intent permission" into jb-mr2-dev
* commit '94a731fabf6830ef3068e78ab0ac435f67daa6a8':
  audio service: fix BT SCO intent permission
2013-03-11 22:46:45 +00:00
Eric Laurent
5ef14b259f Merge "audio service: fix BT SCO intent permission" into jb-mr2-dev 2013-03-11 22:40:48 +00:00
ztenghui
ec509edfa6 am 8313ba36: am 8c63487f: Merge "Java API for MediaMuxer" into jb-mr2-dev
* commit '8313ba36b0186dd93c481cd85418d3e78b33e6ed':
  Java API for MediaMuxer
2013-03-11 21:52:42 +00:00
ztenghui
68ccf103a1 Java API for MediaMuxer
Implement the Java API for MediaMuxer.

bug:7991013

Change-Id: Ibf3aa256cc1d89f1c7636b74c9fb53073d173636
2013-03-11 12:30:56 -07:00
Jean-Michel Trivi
4a57005561 Support multiple IRemoteControlDisplay
Modify RemoteControlClient and AudioService to support multiple
 simulataneous IRemoteControlDisplay interfaces active at the
 same time.

Change-Id: I9f200a488afdd62a5e6957e64624d745e0f28149
2013-03-08 14:22:42 -08:00
Andy McFadden
d8cd823ff9 am ed3ba97f: am 01eaa2d5: Merge "Tweak comment." into jb-mr2-dev
* commit 'ed3ba97f5c96da7b5231a65e150543656f26921f':
  Tweak comment.
2013-03-08 18:28:32 +00:00
Andy McFadden
01eaa2d545 Merge "Tweak comment." into jb-mr2-dev 2013-03-08 17:51:24 +00:00
Andy McFadden
47a2db4943 Tweak comment.
Change-Id: Ic99fefde512fa3a5b1fca2bc65cd37c8170e7f2c
2013-03-07 17:56:40 -08:00
Andy McFadden
ecda86cebc am fe8b6efb: am dd3e75fa: Merge "Publish new MediaCodec API" into jb-mr2-dev
* commit 'fe8b6efbb44476b28b0d8ea3d6cd405d5fbea770':
  Publish new MediaCodec API
2013-03-08 01:55:12 +00:00
Andy McFadden
dd3e75fa6b Merge "Publish new MediaCodec API" into jb-mr2-dev 2013-03-08 01:50:00 +00:00
Eric Laurent
2a57ca931f audio service: fix BT SCO intent permission
Clear calling identity before calling BluetoothHeadset
methods from binder call.
Also send BT SCO audio state intents from the
message handler, not from binder calls.

Bug 8242429

Change-Id: I742ba8dc47a258dbee6fb9d57db302f2bffaafd7
2013-03-07 17:29:27 -08:00
Glenn Kasten
083c7a58b7 Merge "AudioTrack comments and range checks" 2013-03-07 22:28:23 +00:00
Andy McFadden
34f17dd1f6 Publish new MediaCodec API
Un-hide two new methods in MediaCodec, one new constant, and a new
EGL extension.

Bug 7991062
Bug 8191230

Change-Id: I028669132d9ffda1e4b34a561bab3997bbd7dae5
2013-03-07 14:20:46 -08:00
Jeff Brown
cbf4cd73a3 am 7987082e: am 3afc18af: Enhance MediaRouter API.
* commit '7987082ecdcbe5a9e7ca5e0e89e9e30985611dd6':
  Enhance MediaRouter API.
2013-03-07 22:04:09 +00:00
Glenn Kasten
e2a4b42c5b AudioTrack comments and range checks
Added range checks for setPlaybackHeadPosition and setLoopPoints to
correspond to the new implementation.  The checks are not expected to
cause any significant incompatibilities for real apps.

Change-Id: Ia52723419e7d0e2c561a0d1eeb8f36a5376c4e03
2013-03-07 13:56:32 -08:00
Jeff Brown
3afc18af2c Enhance MediaRouter API.
The support library MediaRouter implementation needs a couple
of extra generally useful APIs in the platform MediaRouter to ensure
that it can safely synchronize its state.

Change-Id: I72c5652e10f3b6de48800abfa922affbefbd250f
2013-03-07 13:26:40 -08:00
Mathias Agopian
3d8e7cfa3a am b3a41d44: am 098b3ba5: Merge "fix JNI use of incStrong/decStrong" into jb-mr2-dev
* commit 'b3a41d44274d8d7d6771a008c391dac48a8765c2':
  fix JNI use of incStrong/decStrong
2013-03-07 17:34:46 +00:00
Mathias Agopian
b1d90c8f60 fix JNI use of incStrong/decStrong
Change-Id: Ia11b404dea483dc19bbc30f4d7bcff516655e180
2013-03-06 17:48:20 -08:00
Glenn Kasten
7003ffdd43 Merge "Subclassing AudioTrack considered harmful" 2013-03-05 23:11:35 +00:00
Andy McFadden
43abdc486d Merge "Implement Surface input to MediaCodec." into jb-mr2-dev 2013-03-05 17:39:29 +00:00
Marco Nelissen
daa95754a5 am 056c610c: am b6a2978a: Merge "Performance increase in thumbnail handling"
* commit '056c610c9ba83fbf68e15fa4557620dc7820f087':
  Performance increase in thumbnail handling
2013-03-05 05:40:40 +00:00
Marco Nelissen
b6a2978a51 Merge "Performance increase in thumbnail handling" 2013-03-05 00:06:33 +00:00
Dave Burke
c9b6be7c40 Add nullness check.
Bug: 8313121
Change-Id: Id2221e1c77eaf749ab4c4f6ec4cfa6684927c751
2013-03-04 15:20:42 -08:00
Andy McFadden
2621e40d0e Implement Surface input to MediaCodec.
Adds two new public methods to MediaCodec, and one new public
constant to MediaCodecInfo (currently @hidden).

Bug 7991062

Change-Id: I830a9794e92334ad05c870cc5fc90be4652147a5
2013-03-04 15:04:12 -08:00
Marco Nelissen
66dfcd465c When scanning a single file, take .nomedia into account
Make scanSingleFile behave the same way as scanMtpFile, by taking into
account whether there's a .nomedia file guarding the file being scanned.
Without this, downloaded (or otherwise explicitly scanned) images/video/music
will appear in Gallery and Music even if a .nomedia file is hiding them.

Change-Id: Ib9ad4bda1b9a942f79a37ccd8e6a54d57710f528
2013-02-27 16:53:47 -08:00
John Spurlock
aac753dcf8 DO NOT MERGE - Small documentation fix for AudioManager.java
Correct typo + copy-paste description issue.

Cherry-pick of CL Idce7cfeb7255d96aef91efc40d19f077dde3e9a5 from
master.

Change-Id: I1b6f378d58eafdd4a265672a12189273b41f72d6
2013-02-26 14:18:08 -05:00
Eino-Ville Talvala
788717ca59 Camera and MediaRecorder: Support AppOps
- Allow media processes to update AppOps state
- Pass package name to media services

Bug: 8181262
Change-Id: I115d39f0b306cb9eb7cd3d3e663c680b7322fd3f
2013-02-25 09:27:42 -08:00
Kunter Gultekin
04c13dc26a am e72409fe: Adds vp8 profile and levels to MediaCodecInfo.
* commit 'e72409fe779f620382c5bd0b82f4a32ac91d9fe4':
  Adds vp8 profile and levels to MediaCodecInfo.
2013-02-20 09:39:08 -08:00
Kunter Gultekin
e72409fe77 Adds vp8 profile and levels to MediaCodecInfo.
In line with ongoing effort of adding vpx encoder to
stagefright (https://android-review.googlesource.com/50893)
we need to add profile and level values for VP8.

VP8 profiles and levels are defined in OMX IL 1.1.2
extension headers, which is also being added here
https://android-review.googlesource.com/51272

This alters the public API.

Change-Id: I2bbb91c0b8b522b90c3cdfadaba0d18134800408
Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
related-to-bug: 8226783
2013-02-20 09:35:57 -08:00
Jeff Sharkey
2c87523084 am 81aaf87d: Merge "Open file:// Uris on client side of MediaPlayer."
* commit '81aaf87d097aae2f0a5f8bd7286f82a4d0658b77':
  Open file:// Uris on client side of MediaPlayer.
2013-02-19 15:15:44 -08:00
Jeff Sharkey
c058a380de Open file:// Uris on client side of MediaPlayer.
Bug: 7962739
Change-Id: I674b437593fa083eb66ff3ca57b898cf9bd4a3e9
2013-02-19 15:10:41 -08:00
Mathias Agopian
76f56dd598 am ceec31b7: Merge changes I5a218ca1,I853a76d9
* commit 'ceec31b7dab6a23e443d5dcbcfac4a23b720cfde':
  Refactoring: Rename SurfaceTextureClient to Surface
  clean-up following Surface split
2013-02-15 14:28:22 -08:00
Mathias Agopian
5280061794 Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: I5a218ca11abeeec05e3a4c3cfc581bcc788814ea
2013-02-15 12:47:40 -08:00
Mathias Agopian
163117bdad am bfcae359: Surface doens\'t have an identity anymore
# Via Mathias Agopian
* commit 'bfcae3595900b79401d635022bd6d30a5b5a6576':
  Surface doens't have an identity anymore
2013-02-14 19:58:50 -08:00
Kristian Monsen
1456758802 resolved conflicts for merge of 58a1ca66 to master-chromium
Change-Id: I06b61e6d7d52b584eae03a95220381475b8bff0e
2013-02-14 19:48:27 -08:00
Mathias Agopian
bfcae35959 Surface doens't have an identity anymore
Change-Id: Ic62c0f6ba9aae9b67335a2029a5de1caa3fc5b94
2013-02-14 15:39:04 -08:00
Mathias Agopian
3866f0d581 split Surface in two classes: SurfaceControl and Surface
SurfaceControl is the window manager side; it can
control the attributes of a surface but cannot push buffers
to it. Surface on the other hand is the application (producer)
side and is used to push buffers to the surface.

Change-Id: Ib6754c968924e87e8dd02a2073c7a447f729f4dd
2013-02-14 12:19:11 -08:00
Chris Craik
7c1a49f5f5 Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing
changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f.

Conflicts:
	packages/SystemUI/res/values-sv/strings.xml

Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
2013-02-13 10:50:20 -08:00
Marco Nelissen
145716e7c1 am 789e3fa0: am 9f03d4f9: Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '789e3fa052747feb72e8ffdc778d5bc19a718c06':
  Revert "use utf8_length() instead of local function, isValidUtf8()"
2013-02-12 11:16:17 -08:00
Marco Nelissen
9f03d4f921 Merge "Revert "use utf8_length() instead of local function, isValidUtf8()"" 2013-02-12 18:46:22 +00:00
Marco Nelissen
a0a73ed1e6 Revert "use utf8_length() instead of local function, isValidUtf8()"
This reverts commit 1a8b6c29aaa5a1591097daca0876808cc029cbda

Reason for revert: utf8_length handles a slightly different range than the checkjni code, so it's possible for a given string to pass the utf8_length check, but then fail the jni  check.

Change-Id: I81e15c95edd8f89782d8ad9025e68502b9340f22
2013-02-12 18:33:41 +00:00
Jean-Michel Trivi
679d5046f2 Add support for querying whether the music stream is active remotely
Bug 7485803

Change-Id: I554b44bd35b017fa4030a0d89779066c96594f2b
2013-02-11 10:15:47 -08:00
Eric Laurent
28ad7a8fe1 am 78c2d8b3: Merge "AudioRecord: allow front + back mic capture"
# Via Android (Google) Code Review (1) and Eric Laurent (1)
* commit '78c2d8b356029e191aec5e45de7d9bb0fca98c21':
  AudioRecord: allow front + back mic capture
2013-01-31 22:59:04 -08:00
Eric Laurent
78c2d8b356 Merge "AudioRecord: allow front + back mic capture" 2013-01-31 22:33:37 +00:00
Amith Yamasani
64a980725f am 6d2def71: am c28fde57: am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (3) and others
* commit '6d2def71e0a7f6ed81b96444fb1cce7177251b36':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:40:36 -08:00
Amith Yamasani
6d2def71e0 am c28fde57: am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (2) and others
* commit 'c28fde57f0c7762913615b16d651d4e7991d6175':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:33:55 -08:00
Amith Yamasani
c28fde57f0 am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (1) and others
* commit '0b515aece642283a25c6a4416f0aecdaf17bdb58':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:31:01 -08:00
Amith Yamasani
0b515aece6 am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '3cfca67b0f1e3f464274fa5d3b2e31e5288d8f38':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:28:38 -08:00