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

7330 Commits

Author SHA1 Message Date
Marco Nelissen
55a701e923 am 3fa1d013: am d7b5f3da: Merge "Fix hang" into klp-dev 
* commit '3fa1d013a297605db9c8e2a4ef71f5bf9c888a24':
  Fix hang
 2013-09-25 14:16:15 -07:00
Marco Nelissen
fd2e50086c Fix hang 
b/10855561

Change-Id: I29b046b835ce0ca3644e5c2e8f9bca5c0b380d4b
 2013-09-25 13:45:41 -07:00
Jean-Michel Trivi
8a7ae6708d am 6dda4984: am 80e8a28c: Merge "Fix artwork not received in RemoteController metadata update." into klp-dev 
* commit '6dda4984cf636c2804ee6c6b109bcbb69d4baa04':
  Fix artwork not received in RemoteController metadata update.
 2013-09-24 16:42:49 -07:00
Jean-Michel Trivi
80e8a28c33 Merge "Fix artwork not received in RemoteController metadata update." into klp-dev 2013-09-24 23:37:22 +00:00
Lajos Molnar
9ae69e73af am 6ce2967f: am 566d6b65: Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev 
* commit '6ce2967fa4e9c2a8f8dab741c58c622bacb34a4c':
  WebVttRenderer: allow BOM at beginning of a WebVTT file.
 2013-09-24 11:41:52 -07:00
Lajos Molnar
566d6b6534 Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev 2013-09-24 18:37:12 +00:00
Jean-Michel Trivi
62719220a1 am e783ffab: am bc05918c: Merge "Public API for peak and RMS monitoring through the Visualizer effect" into klp-dev 
* commit 'e783ffab89dbe612a4865a1a1e1a7814522b0ef4':
  Public API for peak and RMS monitoring through the Visualizer effect
 2013-09-24 10:26:46 -07:00
Jean-Michel Trivi
30231077a7 am b25f2640: am e9b0dd89: Merge "Add audio level monitoring capabilities in Visualizer effect" into klp-dev 
* commit 'b25f26405234f5f8e98467f4f09184990dd5a496':
  Add audio level monitoring capabilities in Visualizer effect
 2013-09-24 10:23:01 -07:00
Lajos Molnar
283fe37aa2 WebVttRenderer: allow BOM at beginning of a WebVTT file. 
This is part of the spec.

Change-Id: I61ccc259c0b9d3a2bc4273925665d107b0c89c62
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10900755
 2013-09-24 10:13:43 -07:00
Jean-Michel Trivi
6d298811ef Fix artwork not received in RemoteController metadata update. 
Regardless of the artwork value, always update the metadata.

When updating the metadata, make sure the artwork is stored
 in the artwork field, not in the bundle of the MetadataEditor.

Bug 10862527

Change-Id: Iec83fd9bb358a91c852099b30bb6d307a52a034c
 2013-09-23 18:34:23 -07:00
Jean-Michel Trivi
01b5743aee Public API for peak and RMS monitoring through the Visualizer effect 
Public API to extend the capabilities of the Visualizer audio
  effect with measurements of peak and RMS values.

Bug 8413913

Change-Id: Ifc6646e013ec55fde3523fab685add1d043f1272
 2013-09-23 16:41:53 -07:00
Jean-Michel Trivi
e9b0dd899a Merge "Add audio level monitoring capabilities in Visualizer effect" into klp-dev 2013-09-23 22:58:54 +00:00
Jean-Michel Trivi
badca26cb2 Add audio level monitoring capabilities in Visualizer effect 
Extend the visualizer audio effect with the capability to query
 peak and RMS values for the currently playing audio.
Values are expressed in mB and are retrieved as an array of
 int values in the native layer, and written directly as
 object fields for the JNI.

Bug 8413913

Change-Id: I808075a18e61f85c566544a2bdaae10e5c4a644b
 2013-09-23 14:03:39 -07:00
Igor Murashkin
f17285c465 am 8c871175: am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev 
* commit '8c87117588a1158823d94dec365897d33cec59bf':
  camera2: Rename CameraProperties to CameraCharacteristics
 2013-09-22 09:57:40 -07:00
Igor Murashkin
68f40066c9 camera2: Rename CameraProperties to CameraCharacteristics 
Bug: 10360518
Change-Id: I8667bdcc8c9528ace96dc675585f923004932641
 2013-09-21 21:01:32 -07:00
Jean-Michel Trivi
80326646b7 am 58910a74: am 1608f496: Merge "Public API for RemoteController" into klp-dev 
* commit '58910a746ebf915264b87536ab25148a94714ca2':
  Public API for RemoteController
 2013-09-19 08:57:33 -07:00
Jean-Michel Trivi
1608f496a3 Merge "Public API for RemoteController" into klp-dev 2013-09-19 15:49:40 +00:00
Jean-Michel Trivi
a83487e8c6 Public API for RemoteController 
Public API, under system|signature permission for access to
  currently playing metadata and playback state.
Public API for sending media key events.

Bug 8209392

Change-Id: I39b9309ca3fb1bc305492bad98740df0ae0842b2
 2013-09-18 18:12:51 -07:00
Zhijun He
44ed752191 am 30ba38ac: am bf143ff1: Merge "ImageReader: disable NV21 support" into klp-dev 
* commit '30ba38ac783dfaa5b784fef9450a173abc6710f3':
  ImageReader: disable NV21 support
 2013-09-18 10:54:54 -07:00
Zhijun He
bf143ff195 Merge "ImageReader: disable NV21 support" into klp-dev 2013-09-18 17:49:30 +00:00
Zhijun He
4eda9f5359 ImageReader: disable NV21 support 
Bug: 10787131
Change-Id: I5ff0a67144b5ec49eabde6129423a41c9597c2b8
 2013-09-18 10:30:50 -07:00
Lajos Molnar
161f7c9be8 am 0fe0fe95: am b8462457: Merge "Misc. media API changes" into klp-dev 
* commit '0fe0fe95015040f4b413bfad8c32e125e8d824d0':
  Misc. media API changes
 2013-09-18 10:26:51 -07:00
Lajos Molnar
b84624571b Merge "Misc. media API changes" into klp-dev 2013-09-18 17:20:08 +00:00
Lajos Molnar
370da09782 am e3d75c9d: am e23ce3b1: Merge "Add CaptioningManager listener Subtitle support." into klp-dev 
* commit 'e3d75c9dc8d45f3a1f16601e6d20a2fe10d5d479':
  Add CaptioningManager listener Subtitle support.
 2013-09-18 09:53:01 -07:00
Lajos Molnar
e23ce3b1fc Merge "Add CaptioningManager listener Subtitle support." into klp-dev 2013-09-18 16:46:39 +00:00
Jesse Hall
0741bdefef am 1f9b4861: am 11c92012: Merge "Fix ImageReader onImageAvailable synchronization" into klp-dev 
* commit '1f9b486142408bcdd24d31d6f4a3b2fc96aa6f64':
  Fix ImageReader onImageAvailable synchronization
 2013-09-17 20:36:29 -07:00
Jesse Hall
11c9201240 Merge "Fix ImageReader onImageAvailable synchronization" into klp-dev 2013-09-18 03:32:17 +00:00
Jean-Michel Trivi
14517e6978 am d9250563: am f841d701: Fix javadoc in RemoteControlClient and MediaMetadataEditor 
* commit 'd925056344ca2bd8e3418aefe68774893802f10f':
  Fix javadoc in RemoteControlClient and MediaMetadataEditor
 2013-09-17 19:33:08 -07:00
Jean-Michel Trivi
cac8a1c08c am f54f7d70: am 15bcc323: Merge "RemoteController class to expose IRemoteControlDisplay features" into klp-dev 
* commit 'f54f7d707546a99ffc5345591f2c9488e6149e84':
  RemoteController class to expose IRemoteControlDisplay features
 2013-09-17 19:29:09 -07:00
Jean-Michel Trivi
f841d70155 Fix javadoc in RemoteControlClient and MediaMetadataEditor 
Change-Id: Ibd333d9cb47e74c4ca1d8ec7bd950224d81783b0
 2013-09-17 19:13:55 -07:00
Lajos Molnar
8a39021dfa Misc. media API changes 
- MediaCodec.setParameter signature to take android.os.Bundle
- PARAMETER_KEY_VIDEO_BITRATE value
- comments for MediaFormat.KEY_LANGUAGE and createSubtitleFormat

Change-Id: I092e9830cb21df08b331854cbd28c758db06bc10
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10461617
 2013-09-17 19:05:37 -07:00
Jean-Michel Trivi
7ddd226e7c RemoteController class to expose IRemoteControlDisplay features 
Wrap all the features of IRemoteControlDisplay.aidl in a
 new class, RemoteController, that implements the
 IRemoteControlDisplay interface.

The API functions to expose in the SDK are tagged with
 "CANDIDATE FOR API"

Bug 8209392

Change-Id: I597bcd503ac93e73889c9ae8b47b16c4fcb363bc
 2013-09-18 01:47:25 +00:00
Jesse Hall
c395fffd90 Fix ImageReader onImageAvailable synchronization 
This avoids a race where close() can return while there are still
onImageAvailable callbacks pending.

Bug: 10666923
Change-Id: Ic519b68f3132ceb7f95a9a42ebd1032c1638fbf5
 2013-09-17 18:21:30 -07:00
Matthew Xie
9c1109fa07 am 1d47f003: am c9d1d5f3: Adjust absolute volume only when the device is streaming music 
* commit '1d47f0033b8d46ec476c9e5985f6ce913d4a63aa':
  Adjust absolute volume only when the device is streaming music
 2013-09-17 16:55:21 -07:00
Matthew Xie
c9d1d5f350 Adjust absolute volume only when the device is streaming music 
The device has to be A2DP device
Remove AudioManager#avrcpUpdateVolume
bug 10681804

Change-Id: I2bc85e48fdff374638b984af593c6f1c4ddd3ee6
 2013-09-17 23:48:19 +00:00
Jean-Michel Trivi
d5ed25f805 am 144835ae: am f03ceff2: Merge "Revise new public API for ratings in RemoteControlClient" into klp-dev 
* commit '144835aef8045039ea303bd7d7f03114aea21935':
  Revise new public API for ratings in RemoteControlClient
 2013-09-17 15:40:54 -07:00
Jean-Michel Trivi
f03ceff2f5 Merge "Revise new public API for ratings in RemoteControlClient" into klp-dev 2013-09-17 22:35:08 +00:00
Jean-Michel Trivi
88183e67d4 Revise new public API for ratings in RemoteControlClient 
Refactor RemoteControlClient.MetadataEditor to move functionality
 in new abstract class MediaMetadataEditor, so it can be also
 used on the "display" side of the RemoteControl functionality.
Compatibility of these changes has been tested against
 existing Play applications which use the RemoteControlClient API.

Move the new constants and method definitions related to the
 ratings feature to MediaMetadataEditor. This changes the
 yet-to-be-published ratings API, so this doesn't break
 compatibility.
Rating feature is handled by the new Rating class with a set
 of constructors that handle the different rating models.

Bug 8440498

Change-Id: I9b6dc2204bfc48594bad5cd6449d357f8a485da0
 2013-09-17 15:13:00 -07:00
Lajos Molnar
d486f9656a Add CaptioningManager listener Subtitle support. 
Update default track selection based on settings change.
Implement HLS track selection scheme.
This requires synchronization for subtitletrack and controller.

Change-Id: I8295956d264ab2016a83957ace37d9d7b1acde4c
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
 2013-09-17 10:09:18 -07:00
Jean-Michel Trivi
cb49d18c27 am eded3b50: am 2a07bde6: Merge "Public API for LoudnessEnhancer audio effect" into klp-dev 
* commit 'eded3b50d7f5a334e138338fbeac508fb0c7b679':
  Public API for LoudnessEnhancer audio effect
 2013-09-17 09:05:43 -07:00
Jean-Michel Trivi
2a07bde607 Merge "Public API for LoudnessEnhancer audio effect" into klp-dev 2013-09-17 16:00:07 +00:00
Zhijun He
465d3f4e48 am 6ab1f235: am 48811160: Merge "ImageReader: fix the 0 crop rect size issue" into klp-dev 
* commit '6ab1f2355ca8f9464954ee8bf720fcfc7449052d':
  ImageReader: fix the 0 crop rect size issue
 2013-09-16 19:12:34 -07:00
Zhijun He
4881116047 Merge "ImageReader: fix the 0 crop rect size issue" into klp-dev 2013-09-17 02:07:21 +00:00
Jean-Michel Trivi
c3c0b9921f Public API for LoudnessEnhancer audio effect 
Follows the API style of the other audio effects

Bug 8413913

Change-Id: I1ee21b0af7d9fc565d9cdacd006684577eeb7b21
 2013-09-16 18:07:02 -07:00
Jean-Michel Trivi
4d567f538d am 49e12b69: am 3fb53d82: Merge "Loudness enhancer audio effect" into klp-dev 
* commit '49e12b699df1a132445640afd1403b47dc5b4bee':
  Loudness enhancer audio effect
 2013-09-16 17:59:56 -07:00
Jean-Michel Trivi
3fb53d8238 Merge "Loudness enhancer audio effect" into klp-dev 2013-09-17 00:52:19 +00:00
Zhijun He
9e6d073a99 ImageReader: fix the 0 crop rect size issue 
Rect isValid actually include the zero size case, which we don't want to include
in our case. This causes camera ImageReader test case fails at buffer size
sanity check.

Bug: 9802344
Change-Id: I561f5a049c6117c613df1e1b2789c43af9a19628
 2013-09-16 16:03:36 -07:00
Yu Shan Emily Lau
5a1490a75c am 8e09984a: am 98d18bbc: Merge "Fix media stress test." into klp-dev 
* commit '8e09984a56a4ff12c8726d7c2c6902f1bf081d6f':
  Fix media stress test.
 2013-09-16 14:19:15 -07:00
Yu Shan Emily Lau
98d18bbc5e Merge "Fix media stress test." into klp-dev 2013-09-16 21:11:25 +00:00
Igor Murashkin
8f64e3cd42 am 14297141: am 5cf86aa7: Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev 
* commit '142971418c8e9ca539dae40f3c2532956f258e6b':
  media: Update ImageReader to remove MaxImagesAcquiredException
 2013-09-16 14:08:23 -07:00