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

6145 Commits

Author SHA1 Message Date
Justin Koh
1c35d117f0 am db9b114b: Merge "Adds flag argument to setMasterMute." into ics-aah 
* commit 'db9b114b2e1f9c2034c3cd6df00245b039d90c28':
  Adds flag argument to setMasterMute.
 2012-04-05 10:43:06 -07:00
Yu Shan Emily Lau
8fa23393e9 Merge "Insert the 2 seconds before test start to workaround the race conditon for requesting the surface." 2012-04-04 21:20:54 -07:00
Yu Shan Emily Lau
a79edb7233 Insert the 2 seconds before test start to 
workaround the race conditon for requesting
the surface.

Change-Id: Ic8ba358400492860b0d38fc71468ea4bb4d3d7bd
 2012-04-04 21:17:04 -07:00
Justin Koh
0273af55cf Adds flag argument to setMasterMute. 
Adds flag argument to setMasterMute. This allows third parties to edit it
without showing the UI, for example.

TESTED = runs on Tungsten.

Change-Id: Idfd99a2476e60059cd93c9dfe07d03a389c3f5f5
 2012-04-04 18:40:36 -07:00
Justin Koh
75cf9e19a5 Fix the build. 
Change-Id: Ibe818df8f360837688f12533cf0ac22ef89a8439
 2012-04-04 15:27:37 -07:00
Justin Koh
5ac69a23e0 Merge "resolved conflicts for merge of bff6a514 to master" 2012-04-04 14:54:19 -07:00
Justin Koh
6a8096d7d5 resolved conflicts for merge of bff6a514 to master 
Change-Id: I741d5ab8ed0ce25a27330ffb55ba210534d11c3d
 2012-04-04 14:50:32 -07:00
Marco Nelissen
e313f721ad Store video width/height when scanning 
b/5820120

Change-Id: If2faf554bbf49b341d2634915ba98c1efd70574e
 2012-04-04 14:27:00 -07:00
Andreas Huber
8240d9239d New Crypto JAVA class to facilitate decryption via MediaCodec. 
Change-Id: Ic4e395faa84f003793c2804f2badabab9e7f1034
related-to-bug: 6275919
 2012-04-04 14:06:32 -07:00
Justin Koh
bff6a514da Merge "Persists the master mute volume setting." into ics-aah 2012-04-04 09:45:27 -07:00
Justin Koh
57978ed862 Persists the master mute volume setting. 
Persists the master mute volume setting across reboots.

TESTED = runs on Tungsten.

Change-Id: I9628b9369ca528b22413f62a9e7d697bae61d8ac
 2012-04-03 17:37:58 -07:00
Jason Noguchi
c0c4a20c0f am a72a06f3: am f5693a6a: am a784b3de: Fix build break introduced by missing parenthesis in camera stress test. 
* commit 'a72a06f37ecdd615fb2a29faed99c7f128196211':
  Fix build break introduced by missing parenthesis in camera stress test.
 2012-04-03 17:37:10 -07:00
Jason Noguchi
f5693a6a50 am a784b3de: Fix build break introduced by missing parenthesis in camera stress test. 
* commit 'a784b3dea15dd0dfedfe25552b87fbb92a5eea52':
  Fix build break introduced by missing parenthesis in camera stress test.
 2012-04-03 17:31:00 -07:00
Jason Noguchi
f499a0722b am a784b3de: Fix build break introduced by missing parenthesis in camera stress test. 
* commit 'a784b3dea15dd0dfedfe25552b87fbb92a5eea52':
  Fix build break introduced by missing parenthesis in camera stress test.
 2012-04-03 17:30:55 -07:00
Jason Noguchi
a784b3dea1 Fix build break introduced by missing parenthesis in camera stress test. 
Change-Id: I8da9321a7674dbbe48cc0c214c0b043fbce8eeab
 2012-04-03 17:01:50 -07:00
Jason Noguchi
b7cc80d8f3 am a5408a8c: am 34a4e519: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 
* commit 'a5408a8c75a2839f1b0704f024cc4e523830c128':
  Adding camera zoom test to mediaframework stress suite.
 2012-04-03 16:32:40 -07:00
Jason Noguchi
34a4e519b2 am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 
* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
  Adding camera zoom test to mediaframework stress suite.
 2012-04-03 15:32:34 -07:00
Jason Noguchi
e371ed8de5 am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 
* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
  Adding camera zoom test to mediaframework stress suite.
 2012-04-03 15:32:30 -07:00
Jason Noguchi
6e6d8df5d0 Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 2012-04-03 15:30:22 -07:00
Andreas Huber
991c8733c3 Merge "More DRM/crypto support." 2012-04-03 14:27:35 -07:00
Andreas Huber
0e97fc248e More DRM/crypto support. 
related-to-bug: 6275919
Change-Id: I9179c03f1f91f939afcb3b1c6514a200bf586c93
 2012-04-03 14:16:07 -07:00
Mike Lockwood
b5f2088c8e Merge commit '7f71d01' 2012-04-03 11:54:11 -07:00
Mike Lockwood
3e29718d34 Merge commit '830ad08' 2012-04-03 11:50:08 -07:00
Marco Nelissen
4a727e3421 Merge "Support audio/ogg mimetype" 2012-04-03 08:37:07 -07:00
Marco Nelissen
dc912ed9c6 Support audio/ogg mimetype 
audio/ogg has been the official mimetype for ogg vorbis audio for
a while now, so we should support it.

b/5824157

Change-Id: Ica86bdb3099a10785f1da9c3413284f3e11dc27e
 2012-04-02 16:00:44 -07:00
Justin Koh
3caba51725 Broadcast mastervolume regardless of change. 
Broadcast mastervolume intents regardless of whether the system changed the
volume. This fixes the bug where the volume LEDs stop getting updates.

TESTED = runs on Tungsten.

Change-Id: Id363da3f825934fd7785ed3d3e436f74e657b7e6
 2012-04-02 15:46:56 -07:00
Andreas Huber
5a04bf3955 New API to query available codecs and their capabilities. 
Change-Id: I448ba443a96d8fee2bc9179750d57362ed31d9d9
 2012-04-02 15:43:42 -07:00
Eric Laurent
3d275af3c3 Merge "implemented synchronous audio capture" 2012-03-30 16:00:26 -07:00
James Dong
18a38b9f41 Merge "Removed obsolete opencore related comments" 2012-03-30 15:55:58 -07:00
Chih-Chung Chang
6ef1eedac7 Merge "Fix b/5353417 Images downloaded from browser are showing incorrect details (Time is shown as dec 31 1969)" 2012-03-30 02:50:07 -07:00
Eric Laurent
505e5c8859 implemented synchronous audio capture 
Added the infrastructure to support the synchronization of playback and
capture actions on specific events.
The first requirement for this feature is to synchronize the audio capture
start with the full rendering of a given audio content.
The applications can further be extended to other use cases
(synchronized playback start...) by adding new synchronization events and
new synchronous control methods on player or recorders.

Also added a method to query the audio session from a ToneGenerator.

Change-Id: I4e47f5108c7cbbd3bd334a7fad9b3b6c5ba55d88
 2012-03-29 19:48:40 -07:00
James Dong
7ae82ce1fd Removed obsolete opencore related comments 
Change-Id: Ia05a889ea54a8f38d126508ffdcd09fe2a263538
 2012-03-29 10:44:36 -07:00
RoboErik
830ad08fe4 Merge "b/6232528 Reduce volume persist delay to 500ms" into ics-aah 2012-03-28 15:04:32 -07:00
James Dong
ba4d043331 frameworks base Android.mk file changes 
Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
 2012-03-28 11:03:25 -07:00
James Dong
d927a1d996 Deleted the media, camera, drm related files since they are relocated 
Change-Id: I9bc5573ee07e30b305b5b879023aa9ec69e10b91
 2012-03-28 10:42:44 -07:00
RoboErik
45edba1b8b b/6232528 Reduce volume persist delay to 500ms 
Change-Id: I45c32da0a1089ce8bc865e12b51c069a6db28fd4
 2012-03-27 17:54:36 -07:00
Marius Renn
65953da463 Multi-Project Commit: Move of filterfw out of system/media (2 of 7) 
This is part of the multi-project commit to move the filter-framework
from system/media/mca to frameworks/base/media/mca.

Note that the filter-framework will soon be replaced with a refactored
version currently under API review (also to go under frameworks/base).
This move is done now to unblock the PDK efforts.

Change-Id: I9f42be5a12a9e8157512be11f04e38e4548970be
 2012-03-27 10:44:45 -07:00
Jason Simmons
be587b52c7 Merge "Do not call stop() on the MediaSource if it hasn't been started." into ics-aah 2012-03-27 09:50:08 -07:00
Ray Chen
872e7b7073 Fix b/5353417 Images downloaded from browser are showing incorrect details (Time is shown as dec 31 1969) 
MediaScanner sets DATE_TAKEN with EXIF's datetime tag value. When this information is not available,
ExifInterface will simply return -1 which is accidentally used by MediaScanner.

Adding a check to avoid it so MediaProvider can calculate the date taken from last modified time instead.

Change-Id: I305b93a6c5602cbb9f97c3bbd384d358bda030c6
 2012-03-27 23:37:41 +08:00
Jason Simmons
1f763f7c72 Do not call stop() on the MediaSource if it hasn't been started. 
The MediaSource's destructor will take care of stopping the source.

Bug: 6232094
Change-Id: Iace6c11ded666e7ac7066aa9d493d1b644e4b92d
 2012-03-26 19:12:37 -07:00
Colin Cross
0821013609 stagefright: compile without chromium for pdk builds 
Change-Id: I7d85e04fb9f0caa8460a111ca6181bba6f6497ac
 2012-03-26 12:24:52 -07:00
Andreas Huber
b3e2e24f78 Merge "Provisional support for secure decryption of media streams." 2012-03-26 11:43:06 -07:00
James Dong
61bf87428c Merge "Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h" 2012-03-26 11:41:21 -07:00
Eric Laurent
a561965842 Merge "fix visualizer inactivity detection" 2012-03-26 11:27:41 -07:00
Andreas Huber
9b8e496f4d Provisional support for secure decryption of media streams. 
Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
 2012-03-26 11:24:04 -07:00
Eric Laurent
383c4b3e63 Merge "reorganize SoundPool and JetPlayer code." 2012-03-26 11:23:49 -07:00
Colin Cross
56ca534e65 Merge changes Ib4d0e0c0,Iea8f4a23 
* changes:
  libmedia: remove skia include
  stagefright: remove dependency on skia
 2012-03-26 11:22:29 -07:00
James Dong
6e43c1b51b Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h 
o related-to-bug: 6214141

Change-Id: I548d84a9888be884d3903dc9dea9235258792165
 2012-03-26 11:18:35 -07:00
Eric Laurent
b460566388 fix visualizer inactivity detection 
Current method implemented by the visualizer to detect that audioflinger has
stopped providing audio buffers does not work if the application
reads pcm captures too fast.

The fix consist in implementing a method based on real time measurement only.
One drawback is that the new method makes use of system calls that add some
overhead to the process and capture functions.

Change-Id: I53bd596b856f1cc7f0f47e08413af3335227100b
 2012-03-26 11:05:25 -07:00
Eric Laurent
f5e1812549 reorganize SoundPool and JetPlayer code. 
Reorganize SoundPool and JetPlayer code to be ready for the
creation of libmedia_native.

Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation).
Remove dependencies on nativehelper/jni.h from JetPlayer.

Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
 2012-03-26 10:54:41 -07:00