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

9227 Commits

Author SHA1 Message Date
Chong Zhang
d6686a62f7 Merge "media: discard duplicate CEA-608 ctrl code" 2015-02-11 02:35:08 +00:00
Marco Nelissen
9408ce362e am 6da3cc59: am 396f131d: Merge "Fix memory leak" 
automerge: fb14e77

* commit 'fb14e77f45fbad139a0b0c9278bd003964b8f987':
  Fix memory leak
 2015-02-11 00:36:48 +00:00
Marco Nelissen
fb14e77f45 am 6da3cc59: am 396f131d: Merge "Fix memory leak" 
* commit '6da3cc59a0e77e723a8413d2443b0f1bc5821b03':
  Fix memory leak
 2015-02-11 00:00:57 +00:00
Marco Nelissen
06524dccbc Fix memory leak 
Change-Id: Id691f9b32f9daeb23a01b17c5418b4d74a294cda
 2015-02-10 15:45:23 -08:00
John Spurlock
6156017c22 Move AudioService to services. 
...and a few dependencies. Move remaining shared items to AudioSystem.

Change-Id: Ib9623ff867678d34977337856bb0156e8cdaeeb5
 2015-02-09 17:13:38 -05:00
RoboErik
7d85bc4c43 Merge "Delay unmuting on volume down" 2015-02-09 22:08:05 +00:00
Chong Zhang
56a7ed6982 media: discard duplicate CEA-608 ctrl code 
bug: 19297083
Change-Id: I6c108e2c597e7b3fd770306a26e110208dc5ece0
 2015-02-09 13:52:20 -08:00
RoboErik
5452e25844 Delay unmuting on volume down 
This allows the user to turn the volume down before a stream is unmuted by
delaying the unmute call while volume down requests are still being made.

bug:19297183
Change-Id: I65a8e489eb4cbfeace4f539103ee0025584102da
 2015-02-09 12:54:19 -08:00
Chong Zhang
fb54267e71 am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev automerge: eceae03 
automerge: 3968f0c

* commit '3968f0c2dfa5cbb1432d49af47ad2fa89f1b2225':
  reset col position to 1 on row PAC
 2015-02-06 03:21:37 +00:00
Chong Zhang
3968f0c2df am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
automerge: eceae03

* commit 'eceae03f6a21b36baddabe4ca5a2c1d9d238240a':
  reset col position to 1 on row PAC
 2015-02-06 03:17:36 +00:00
Chong Zhang
6cad6513e0 Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 2015-02-06 02:06:24 +00:00
Chong Zhang
6286f8ec05 reset col position to 1 on row PAC 
bug: 19284568
Change-Id: I7d439027ab6411bcd5c149580babee80dc5f9478
 2015-02-05 16:46:06 -08:00
RoboErik
5387988fc9 Merge "Make isStreamMute correctly handle master volume devices" 2015-02-05 23:23:16 +00:00
Paul McLean
26bf3ea56e Merge "Add additional info to AudioPort for enum/selection API." 2015-02-05 18:26:56 +00:00
John Spurlock
951c04bf4d Merge "Use shared value for default muteable streams." 2015-02-05 17:40:50 +00:00
John Spurlock
24c0518723 Use shared value for default muteable streams. 
Change-Id: Ib8fa7aee3bed83fc26945fd0caf0cbd9f4f8af3a
 2015-02-05 12:30:36 -05:00
Paul McLean
10804eb281 Add additional info to AudioPort for enum/selection API. 
Add "device name" member to AudioPort.
Moved unique device ID from DevicePort to AudioPort.
Straighten out confusion between "name" and "address"
Created string constants for Intent "extra" data keys.
Combine card/address data into "address" at sender.Add additional info to AudioPort for enum/selection API.
Parse out USB Device name in UsbCardsParser.

Change-Id: Ifd76b0298312090a8f39e638339f993b86d47080
 2015-02-04 14:37:19 -08:00
RoboErik
4fa359e86d Make isStreamMute correctly handle master volume devices 
isStreamMute should return the master mute value if mUseMasterVolume
is true. This adds that check.

Change-Id: I6d5f5552c480028972e69ff9d670e10c4e496d05
 2015-02-04 14:25:16 -08:00
Elliott Hughes
969f0708d9 am 4c49b1fb: am b2d7ca7c: am fd2c1307: Merge "Fix build." 
* commit '4c49b1fb774d59d3a6e8a6bb5a4549828504c5af':
  Fix build.
 2015-02-04 20:45:18 +00:00
Elliott Hughes
4c49b1fb77 am b2d7ca7c: am fd2c1307: Merge "Fix build." 
* commit 'b2d7ca7c6ffbb460dd8a8f8cbac8b627a3e27718':
  Fix build.
 2015-02-04 20:37:59 +00:00
Elliott Hughes
f953ca2ec8 Fix build. 
Change-Id: Ic14b6de7e7e58ce42ae4cc5ca945e4896e3b7b8f
 2015-02-04 12:24:21 -08:00
Lajos Molnar
46a9721aeb Merge "MediaCodecInfo: remove stack trace logspam when querying invalid sizes" 2015-02-04 08:19:27 +00:00
Wonsik Kim
f33c833ca0 am b86a4558: am 015fdf39: Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev automerge: d7310bd 
* commit 'b86a45588a67f88730c15c82f624cd64fe1da80c':
  audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
 2015-02-03 23:59:02 +00:00
Wonsik Kim
b86a45588a am 015fdf39: Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev automerge: d7310bd 
* commit '015fdf392388f1bed3298f9f44012c1a82d7c1a1':
  audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
 2015-02-03 23:52:42 +00:00
Jean-Michel Trivi
a1852f6ec8 Merge "AudioAttributes javadoc update for conversion to stream types" 2015-02-03 23:02:20 +00:00
Jae Seo
338a29a64f TIF: Add a comment to remove padding around the channel logo image 
Bug: 19066924
Change-Id: Ibb1efb945550028be4106ead826b1e152e488c92
 2015-02-03 12:39:35 -08:00
Jean-Michel Trivi
3d22bf04e3 AudioAttributes javadoc update for conversion to stream types 
Change-Id: I2b687d8a002897fff90a8c99d180aa0a3511a571
 2015-02-03 10:15:08 -08:00
Glenn Kasten
547c9e5212 Merge "Clarify that flush does not necessarily free up buffer space" 2015-02-02 22:32:37 +00:00
Glenn Kasten
7a121563d5 Clarify that flush does not necessarily free up buffer space 
Change-Id: I6f77efb6a8da5e11c0cc68f0bb3ce47a0c1cb3da
 2015-02-02 14:16:23 -08:00
RoboErik
00b1b712d2 Merge "Route volume keys directly to the audio system on TVs" 2015-02-02 17:47:52 +00:00
Wonsik Kim
b561ccedd8 audio: allow audio port cache update even when audio patches contain invalidated sources/sinks 
When an audio device disconnects from Android, custom audio patches
containing the device become invalidated.
AudioManager::updateAudioPortCache() used to fail in that case, but
it causes onAudioPortListUpdated() event never gets called so that
the creator of the custom audio patch cannot update it. Let
updateAudioPortCached() succeed even in the case so that the entity
that created the audio patch can get notified.

Bug: 18909299
Change-Id: If4f6ed73f69213d792117fb42aec103ae2e50b79
 2015-01-31 01:51:28 +00:00
RoboErik
ddce02f3b9 Merge "Move mute/unmute handling to adjust volume paths" 2015-01-30 18:55:10 +00:00
RoboErik
001c59c637 Route volume keys directly to the audio system on TVs 
This routes volume and mute keys directly to the audio system when
on a television instead of letting apps or sessions intercept them.

Change-Id: I2af47e30c7842aca96d045a6cc9ca025b94e546a
 2015-01-29 16:14:31 -08:00
RoboErik
4197cb60bc Move mute/unmute handling to adjust volume paths 
This deprecates the setStreamMute and setStreamSolo APIs. Soloing is no
longer supported and muting is redirected through the adjust volume APIs.

Also updates the hidden master versions of these APIs.

Change-Id: I65d2a5d5fc15b386bd497abf8ca6869fec75a26a
 2015-01-29 16:14:30 -08:00
Lajos Molnar
6c9833b967 MediaCodecInfo: remove stack trace logspam when querying invalid sizes 
Change-Id: I0ed3825f17cacb0502c40483462f1d76f92e5efa
 2015-01-29 10:24:37 -08:00
Lajos Molnar
51b29be528 Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev automerge: 8514766 automerge: 2a8dc00 
automerge: df876a1

* commit 'df876a110c4b6d55b4a9df57621aa38ff06c6de8':
  ImageReader: add support for compatible flexYUV buffers
 2015-01-29 08:06:48 +00:00
Lajos Molnar
df876a110c Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev automerge: 8514766 
automerge: 2a8dc00

* commit '2a8dc00eedeb2b8a9fa3560d8afa4cfd7c17d395':
  ImageReader: add support for compatible flexYUV buffers
 2015-01-29 08:02:53 +00:00
Lajos Molnar
4fb442617c ImageReader: add support for compatible flexYUV buffers 
Bug: 17906609
Change-Id: Ia21aff632b9a92f4e391b3917a7774af46fd81a0
 2015-01-28 17:34:23 -08:00
Jae Seo
2920f0f510 am 4b1e5814: am 71191442: TIF: Do not call session callbacks when the session is already released 
automerge: 4980163

* commit '49801634e46bdba633aba6f7944f0417496b38ce':
  TIF: Do not call session callbacks when the session is already released
 2015-01-29 00:50:04 +00:00
Jae Seo
49801634e4 am 4b1e5814: am 71191442: TIF: Do not call session callbacks when the session is already released 
* commit '4b1e5814d18dae8f2581cf702da4b4e1de0c3eb4':
  TIF: Do not call session callbacks when the session is already released
 2015-01-29 00:46:25 +00:00
Jae Seo
7119144218 TIF: Do not call session callbacks when the session is already released 
Bug: 19146382
Change-Id: I5592d4bf033478e5e5e1013bd2ad5ea572df44dd
 2015-01-28 15:50:08 -08:00
RoboErik
66df850de2 Merge "Add getMediaItem API to MediaBrowser" 2015-01-28 18:52:41 +00:00
Marco Nelissen
565bca4e19 am 3ea395dd: am 4e853598: Merge "Fix printf format" 
automerge: 2c2415a

* commit '2c2415a552b62016886af62419080ca7ac327871':
  Fix printf format
 2015-01-27 23:40:39 +00:00
Marco Nelissen
0a3f0b020e am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec" 
automerge: 6e14c57

* commit '6e14c5705c5acf9d6036060252f257a084cd7578':
  Make SoundPool use MediaCodec
 2015-01-27 23:33:05 +00:00
Matthew Xie
f4244f579d am 46c3304a: am 485813a0: Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev 
automerge: e213c68

* commit 'e213c6813e5abe51d1359bacc1ae5f0ca5367505':
  Delay the second message for 30ms more than the last message for a2dp
 2015-01-27 23:31:32 +00:00
Marco Nelissen
2c2415a552 am 3ea395dd: am 4e853598: Merge "Fix printf format" 
* commit '3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb':
  Fix printf format
 2015-01-27 20:33:09 +00:00
Marco Nelissen
6cd6110773 Fix printf format 
Change-Id: Ied2f10bb59fe0e13b23bf1f9913ab3b081348a28
 2015-01-27 12:17:48 -08:00
Marco Nelissen
6e14c5705c am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec" 
* commit '99985d98c23b32acc0014031d7b88ee4eed21a4b':
  Make SoundPool use MediaCodec
 2015-01-27 18:28:53 +00:00
Matthew Xie
e213c6813e am 46c3304a: am 485813a0: Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev 
* commit '46c3304aed2cabb592e499b0b3de56a312e1d67f':
  Delay the second message for 30ms more than the last message for a2dp
 2015-01-27 18:22:57 +00:00
Matthew Xie
485813a00c Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev 2015-01-27 18:13:40 +00:00