7957 Commits

Author SHA1 Message Date
Eric Laurent
0aa1cbb0de Merge "DO NOT MERGE - AudioManager: audio routing extensions" into lmp-preview-dev 2014-05-28 22:11:20 +00:00
Mike Lockwood
3378717241 Merge "Add Audio Manager support for Bluetooth A2DP Sink profile" 2014-05-28 21:54:11 +00:00
Eric Laurent
0abcc5a0bb DO NOT MERGE - AudioManager: audio routing extensions
Added API and classes allowing framework components
to have direct control over audio routing and volumes.

Change-Id: I28225a6ebad86a7836e1ed749d93c0e964e215f1
2014-05-28 14:41:28 -07:00
Eino-Ville Talvala
5b02e9f65f am a4aad3d0: Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev
* commit 'a4aad3d0e5c258d6bbf6254ec5ab80a470b1b529':
  camera2: Update native/managed key mappings.
  Camera2: switch API interface to java classses
  Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
  camera2: Add new metadata keys, change types for existing range keys
  Camera2: Replace int[] by MeteringRectangle
2014-05-28 20:35:58 +00:00
Eino-Ville Talvala
b9a65de1f7 Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev
* changes:
  camera2: Update native/managed key mappings.
  Camera2: switch API interface to java classses
  Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
  camera2: Add new metadata keys, change types for existing range keys
  Camera2: Replace int[] by MeteringRectangle
2014-05-28 20:33:42 +00:00
Mike Lockwood
0a40ec2192 Add Audio Manager support for Bluetooth A2DP Sink profile
Change-Id: Iff6035e85faf52647cc41a59f98ba2924300eb8d
2014-05-28 13:32:08 -07:00
Yin-Chia Yeh
8490ace76f Camera2: switch API interface to java classses
android.sensor.info.physicalSize: float[] -> SizeF
android.statistics.hotPixelMap: int[] -> Point[]
android.tonemap.curve[Red|Green|Blue]: float[] -> TonemapCurve

Bug: 14628001
Change-Id: I1e085f5e640a059852fcb504b6dd5f884039e653
2014-05-28 01:36:54 -07:00
Igor Murashkin
78712a8bd7 camera2: Add new metadata keys, change types for existing range keys
Also adds the following keys:
* android.control.maxRegionsAe
* android.control.maxRegionsAwb
* android.control.maxRegionsAf
* android.request.maxNumOutputRaw
* android.request.maxNumOutputProc
* android.request.maxNumOutputProcStalling

Changes the following keys' type
generations:
* android.control.aeTargetFpsRange
* (Range<Integer>)
* android.control.aeAvailableTargetFpsRanges
* (Range<Integer>[])
* android.control.aeCompensationRange
* (Range<Integer>)
* android.lens.focusRange
* (Range<Float>)

Bug: 14628001
Change-Id: I141847dffc4b0d89cea37c19a54d6d5faf24a9bb
2014-05-28 01:36:53 -07:00
Jean-Michel Trivi
1ad0192800 DO NOT MERGE temporary hide of AudioAttributes
Bug 15089989

Change-Id: I6077d4906d5624be4dd2b8a5c3378a04c848b6d8
2014-05-27 12:44:05 -07:00
Eric Laurent
bac10fa652 Merge "AudioManager: audio routing extensions" 2014-05-27 17:35:30 +00:00
Eric Laurent
a198a29250 AudioManager: audio routing extensions
Added API and classes allowing framework components
to have direct control over audio routing and volumes.

Change-Id: I28225a6ebad86a7836e1ed749d93c0e964e215f1
2014-05-27 08:46:56 -07:00
John Spurlock
53bd26335c am c5890bb9: Merge "VolumeZen: combine ringer/notification volume and zen." into lmp-preview-dev
* commit 'c5890bb9c2361adf64efa7a2680536edaa527d1f':
  VolumeZen: combine ringer/notification volume and zen.
2014-05-27 14:23:40 +00:00
John Spurlock
8600534df6 VolumeZen: combine ringer/notification volume and zen.
- Implement a new volume panel widget, combining volume and
  zen mode + conditions.
- Show zen mode + conditions when modifying ringer or notification
  streams.
- Host the volume panel widget in a dialog when being controlled
  by the audio service / volume keys.
- Remove support for multiple sliders in the volume panel.
- Remove support for separate ringer + notification volumes
  in the volume panel.
- Move volume panel resources up to SystemUI.
- Create a new combined Notifications quick settings tile.
- Host the volume panel widget in the quick settings panel under
  Notifications.
- When the quick settings detail panel is visible, route the volume
  keys to the embedded widget instead of showing a redundant dialog.
- Create common styles for quick settings text to be closer to spec.
- Update the framework resources for the ringer stream.
- Show the ringer icons in global actions.
- Add "until you turn this off" back as a separate zen condition.
- Disable time condition buttons when they are N/A.
- Don't allow volume changes to set ringer mode silent.

Bug:15186070
Change-Id: Id5e321dd1d5e7c4cf3917027ffbdf7e80d38b00d
2014-05-27 10:08:00 -04:00
Ruben Brunk
94ecb5506a am a7c97c55: Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev
* commit 'a7c97c552a280ed3a2ff3535a5085f8601f45820':
  camera2: Move DngCreator to hardware/camera2.
2014-05-24 00:30:06 +00:00
Ruben Brunk
0bfa56e766 Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev 2014-05-24 00:25:59 +00:00
Glenn Kasten
e01043797d Merge "Remove android.media.AudioFormat default constructor" 2014-05-23 22:14:17 +00:00
Eric Laurent
6b02c898f5 am 5231cb4b: am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"
* commit '5231cb4bfbdd20200555f263ee73b439e33d1ec0':
  AudioService: fix cross deadlock in VolumeStreamState
2014-05-23 21:49:41 +00:00
Eric Laurent
5231cb4bfb am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"
* commit 'b928b7c2bf12a5dbd31b08d244b0ff8d2a9851c1':
  AudioService: fix cross deadlock in VolumeStreamState
2014-05-23 21:41:47 +00:00
Eric Laurent
b928b7c2bf am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"
* commit 'ba64d298bee228b8e27ea17fb31fbff4b4188304':
  AudioService: fix cross deadlock in VolumeStreamState
2014-05-23 21:37:54 +00:00
Eric Laurent
fdbee869be AudioService: fix cross deadlock in VolumeStreamState
Synchronize modifications of volume index by VolumeStreamState
class mutex instead of using synchronized methods.
This avoids possible cross deadlock when modifying volume on
two stream types simultaneously and one is slave to the other.

Bug: 13730145.

Change-Id: I13406c71010ce0c2e2f08f660b6101f310396c98
2014-05-23 21:32:06 +00:00
Igor Murashkin
d6d65154e5 camera2: Refactor CameraMetadata.Key out into 3 key classes
Before:
* CameraMetadata.Key<T>

After:
* CameraCharacteristics.Key<T>
* CaptureResult.Key<T>
* CaptureRequest.Key<T>

CameraMetadata#get has been removed (each metadata subclass has
its own #get now) due to java generic limitations (in particular
a type bound <T1<T2> extends Key<T2>> is an illegal bound).

CameraMetadataNative gets a new #dumpToLog function to dump the native
metadata to logcat.

Bug: 15091017
Change-Id: Ic56c54c0d184e209e20de374dc8a6d79527c209f
2014-05-23 11:55:29 -07:00
Glenn Kasten
1aa74e4bc2 Remove android.media.AudioFormat default constructor
Change-Id: I2fe65ee7a8087151b44da3b84af357ea8bee80c4
2014-05-22 17:13:06 -07:00
Ruben Brunk
b6079005ed camera2: Move DngCreator to hardware/camera2.
Bug: 15091253
Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
2014-05-22 22:57:11 +00:00
Ruben Brunk
94520c7460 Merge "camera2: Add HAL1 compatibility shim skeleton." 2014-05-22 06:08:56 +00:00
RoboErik
02014c8faa Switch to using int stream instead of AudioAttributes
This is an alternate to the submitted API which doesn't use the new
AudioAttributes class and just takes the AudioManager.STREAM instead.

Change-Id: I0365bc6fb9196fc33852ba6b202ca553efe0cc85
2014-05-21 19:04:08 -07:00
RoboErik
33983a9011 Add stream/volume apis to sessions
This adds RemoteVolumeProviders which handle volume change
events and a way to switch a session between local stream
playback and remote playback handling.

This also adds a way for an app to specify the PendingIntent
to launch when we want to show their ongoing playback UI.

Change-Id: I3a72bf2ec7ca55f61f50859ddc2988eebd491e9d
2014-05-21 17:43:18 -07:00
Ruben Brunk
feb50af361 camera2: Add HAL1 compatibility shim skeleton.
This adds basic support for running the Camera2 API on a device running
a camera HAL version lower than CAMERA_MODULE_API_VERSION_2_0.

This CL includes support for:
- N-way preview output streams
- N-way jpeg output streams
- CameraDevice emulation at the binder interface
- Basic camera metadata querying in the CameraManager

Bug: 15117269
Bug: 15116722

Change-Id: I8322955034c91f34bb348d4b28c2b774dbef38f6
2014-05-21 16:37:59 -07:00
RoboErik
5b53148a4e Merge changes I1cbdff1d,I23906b4c
* changes:
  Handle headsethook voice launching
  Add 5s timeout to wakelock
2014-05-21 19:59:11 +00:00
Glenn Kasten
ed727159d6 Merge "Update android.media.AudioTrack.getTimestamp API documentation" 2014-05-21 18:38:42 +00:00
Jeff Tinker
7e1329f574 Build cast v2 mediadrm signer library as non-static
bug: 13988104
Change-Id: Ie94074dd46e4489c7d4e0f378d1e35b14bb0c0ac
2014-05-21 18:18:03 +00:00
Glenn Kasten
486918b415 Update android.media.AudioTrack.getTimestamp API documentation
Change-Id: I0928c73c147ce843ae46565883da209b278fb3b4
2014-05-21 09:36:41 -07:00
John Spurlock
3346a80208 VolumeZen: SystemUI now hosts the volume dialog.
- Allow SystemUI to set the volume controller interface using
  a new binder call to audio service.
- Remove VolumePanel's dependency on AudioService.
- Host the base VolumePanel in the SystemUI process.

Change-Id: I095d5a1a579d42b68d0f81abb4087bd0c754b876
2014-05-21 09:58:41 -04:00
RoboErik
418c10ca9d Add 5s timeout to wakelock
Also filed a b/15110168 to anr the app if it doesn't finish with the
button event in 5s.

Change-Id: I23906b4c7f17d3d3a29eef92b523d8653c87017e
2014-05-20 14:57:46 -07:00
Eric Laurent
c0e439f1b7 Merge "AudioSystem: add new audio device definitions" 2014-05-20 21:39:23 +00:00
RoboErik
23a42810e3 Merge "Add getMediaSession to RCC" 2014-05-20 21:02:18 +00:00
RoboErik
5f31737c68 Add getMediaSession to RCC
This is to make integration with Media notifications easier.

Change-Id: I783ae5c2620ff0e11bf5584604b9c9623850e2f0
2014-05-20 14:00:53 -07:00
Andy Hung
b5eb843e4b Merge "Fix 64 bit long pointer size for media scanning" 2014-05-20 17:36:11 +00:00
Andy Hung
989540264a Fix 64 bit long pointer size for media scanning
Bug: 14993718
Change-Id: I98989caddcca67c2b3257cead948382fddb066da
2014-05-19 21:18:18 -07:00
Eric Laurent
948d32748c AudioSystem: add new audio device definitions
Change-Id: Ib7675bc33771365b2dbb7694c522469317b11457
2014-05-19 18:43:49 -07:00
Rachad
c9550f2ce8 Merge "Add HEVC decoder support ot MediaCodec bug: 14571712" 2014-05-19 23:00:29 +00:00
RoboErik
b19c192654 Merge "Rename session classes to have media prefix, hide routes" 2014-05-19 19:29:06 +00:00
RoboErik
b4f4f69e4c Merge "Move media key processing to sessions" 2014-05-19 19:28:54 +00:00
Ruben Brunk
f967a5486a camera2: Plumb DngCreator to native library.
Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
2014-05-16 23:25:51 -07:00
RoboErik
42ea7eecd1 Rename session classes to have media prefix, hide routes
This renames several of the core session classes to be prefixed
with Media. It also adds @hide to all route references for now.

Change-Id: Idb42897d490cf24626e4e93ca975b2cb93ec054c
2014-05-16 16:40:17 -07:00
Eric Laurent
bc11a696f6 AudioSystem: native to JAVA status translation
Regroup status code translation from native to JAVA in AudioSystem.
The same codes will be used by AudioTrack, AudioRecord, AudioManager
and defined in a single place in AudioSystem.

Change-Id: I7d3f39f30e3bb8e53f33f4408bcb0672df8af42b
2014-05-16 15:50:42 -07:00
RoboErik
8a2cfc309a Move media key processing to sessions
Send all media key events over to the MediaSessionService instead
of AudioManager. This does not affect volume handling yet, so it
is possible to get into a state where volume will be handled by
a different thing than media buttons. Except for corner cases
this shouldn't be noticable.

Change-Id: I00a576175d9c82937f0836e509b9a98d5cb77b83
2014-05-16 15:10:27 -07:00
Igor Murashkin
9d08a93b2d Merge "camera2: Move parameters around to different packages" 2014-05-16 18:08:41 +00:00
Sungsoo Lim
07d5e7d5fa Merge "Implements TtmlRenderer." 2014-05-16 01:56:17 +00:00
RoboErik
7e89723bb4 Merge "Add UserRecords to separate user interactions" 2014-05-15 23:08:26 +00:00
Igor Murashkin
72f9f0a96e camera2: Move parameters around to different packages
* Camera-specific params to android.hardware.camera2.params
* Remove android.hardware.camera2.Size
* Move Rational to android.util

Bug: 14628001
Change-Id: Ie7a82bf9f4a0d8c18e0dc3a1581123c0d95da3f0
2014-05-14 18:24:58 -07:00