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

9201 Commits

Author SHA1 Message Date
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
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
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
Marco Nelissen
e74da38e21 Merge "Make SoundPool use MediaCodec" 2015-01-27 17:49:02 +00:00
RoboErik
b1c88103fe Add getMediaItem API to MediaBrowser 
This adds all the plumbing for supporting a getMediaItem call in
MediaBrowser.

Will also need to add a support lib component to make it backward
compatible.

Change-Id: I528e9ebaf4e0fe386f346ef85c14973168a380df
 2015-01-26 14:37:05 -08:00
Mike Lockwood
c26f67051e am 2d1e078a: am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev 
* commit '2d1e078ac45a646ee55bb9aca022dafd143ff95b':
  MTP: Fix partial implementation of 5 new audio specific properties
 2015-01-26 19:17:30 +00:00
Mike Lockwood
2d1e078ac4 am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev 
* commit '5ac22aa60f773917981f42e64fbc28615871fd3e':
  MTP: Fix partial implementation of 5 new audio specific properties
 2015-01-26 19:10:44 +00:00
Elliott Hughes
c4be6461b3 am f51d65ad: Merge "Add missing <string.h> includes." automerge: 82a1a2c automerge: 86b48b3 
* commit 'f51d65ade0112c3d50c3d9182f583730a597322b':
  Add missing <string.h> includes.
 2015-01-25 20:53:33 +00:00
Elliott Hughes
f51d65ade0 Merge "Add missing <string.h> includes." automerge: 82a1a2c 
automerge: 86b48b3

* commit '86b48b3f8056a8efa6857d87dd4f30495e8b0464':
  Add missing <string.h> includes.
 2015-01-25 19:27:25 +00:00
Elliott Hughes
35af2c3534 Add missing <string.h> includes. 
Change-Id: I188bfe1388fa49f6f79d247aa0d0f4fb089de503
 2015-01-25 08:33:36 -08:00
Marco Nelissen
372be8970c Make SoundPool use MediaCodec 
Bug: 18239054
Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
 2015-01-23 12:49:36 -08:00
Mike Lockwood
7182774810 MTP: Fix partial implementation of 5 new audio specific properties 
In change Ic5b3fb75309893caae1a4f4b56068a543847f1f7, we added partial
support for the MTP properties:

MTP_PROPERTY_AUDIO_WAVE_CODE,
MTP_PROPERTY_BITRATE_TYPE
MTP_PROPERTY_AUDIO_BITRATE
MTP_PROPERTY_NUMBER_OF_CHANNELS
MTP_PROPERTY_SAMPLE_RATE

However we were not returning any values for these properties in the result
of the MTP GetObjectPropList command. Strangely, this triggers a nasty bug
in Windows 7 that results in data loss.  When copying a directory containing
several MP3 files from one location on the device to another, Windows will
copy only some of the files to the new location, but delete all of the originals.
Finishing the implementation of these new object properties for some unknown
reason stops this bad behavior in Windows 7.

Bug: 19018427
Change-Id: I5fd3b91a89b31827d3100686445cef6795fe0f3f
 2015-01-23 10:58:38 -08:00
Matthew Xie
c525cf7a33 Delay the second message for 30ms more than the last message for a2dp 
In function setBluetoothA2dpDeviceConnectionState, current code calculate
the delay of the second state update message to be exactly the same as the
last delayed messages. This causes a problem that the sequence of the
messages may be altered.
Bug: 19036411

Change-Id: I35762873fd3341ec098dd229ac96bd42d6f34195
 2015-01-22 20:54:54 -08:00
Jean-Michel Trivi
157784b575 Add support for AudioAttributes in AsyncPlayer 
As an audio playback API, AsyncPlayer needs to support specifying
  AudioAttributes.
Deprecate play() method with stream type.

Change-Id: Ia9561883e7b398666a3d5d6da4e00324eda6b0e9
 2015-01-22 15:32:09 -08:00
Christopher Tate
b6d4b350a1 am 77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" into lmp-mr1-dev automerge: 8192670 
automerge: ebdec3e

* commit 'ebdec3e0921d1495ca712f4f1f7755d975297d14':
  Don't launch broadcast receiver processes during boot
 2015-01-21 00:09:39 +00:00
Christopher Tate
ebdec3e092 am 77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" into lmp-mr1-dev 
automerge: 8192670

* commit '8192670937e3dee8e2c521a9ed1118a5782a2912':
  Don't launch broadcast receiver processes during boot
 2015-01-20 23:55:00 +00:00
Christopher Tate
267603f3bb Don't launch broadcast receiver processes during boot 
Broadcasts that might be sent before the boot process has completed must
be restricted to registered receivers, at least while still in the
middle of booting.

Bug 19060618

Change-Id: Ib4e0990cf252f34344f7a0bd19a0e72919013e0f
 2015-01-20 14:21:21 -08:00
Mike Lockwood
3d0fb88138 Merge "Replace broadcasts with calls to IAudioService.setWiredDeviceConnectionState() to report USB device status" 2015-01-17 00:33:42 +00:00
Jean-Michel Trivi
a47d85e8dc am c2230a9d: am ef417bb7: am 6a64a9cd: Merge "Prevent AudioService dead lock issue." 
* commit 'c2230a9d1a7bba12b78630a0dfbad7be5c97050f':
  Prevent AudioService dead lock issue.
 2015-01-16 17:43:20 +00:00
Jean-Michel Trivi
c2230a9d1a am ef417bb7: am 6a64a9cd: Merge "Prevent AudioService dead lock issue." 
* commit 'ef417bb7a06b0d58faa21f42599d7dd4fd9e3ff2':
  Prevent AudioService dead lock issue.
 2015-01-16 17:37:29 +00:00
Jean-Michel Trivi
6a64a9cd26 Merge "Prevent AudioService dead lock issue." 2015-01-16 17:23:36 +00:00
Mike Lockwood
2e3434149e Replace broadcasts with calls to IAudioService.setWiredDeviceConnectionState() to report USB device status 
Change-Id: Ic96cffaa63b6c6350b76e7cb29398c5f5dc86962
 2015-01-16 09:23:15 -08:00
Eric Laurent
1eadf93d99 am c3fb94ca: am 4772f8b8: am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 
* commit 'c3fb94caf0d5a4b8f6a3c9bbc6ce31cbfd0ef2f0':
  AudioManager: make AudioPortEventHandler static
 2015-01-16 00:05:38 +00:00
Eric Laurent
c3fb94caf0 am 4772f8b8: am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 
* commit '4772f8b841dc1ad50999e2cca3f1d366b325b915':
  AudioManager: make AudioPortEventHandler static
 2015-01-15 22:21:58 +00:00
Eric Laurent
f076db4070 AudioManager: make AudioPortEventHandler static 
Make AudioPortEventHandler and audio port and patch caches
static members of AudioManager. There is only one callback
per process in AudioSystem for audio port updates
and having those non static would not work when more than
one AudioManager instance exists in one app.

Bug: 18727023.
Change-Id: I4c1041dc6441d168be4efa066e14289cc5f41872
 2015-01-15 10:13:52 -08:00
Yohann Roussel
45a669e5e9 Merge "Fix bad import in VideoDumpActivity" 2015-01-15 17:57:40 +00:00
Jean-Michel Trivi
757882088f Merge "AudioService: force use impacts BECOMING_NOISY intent" 2015-01-15 17:14:13 +00:00
Jean-Michel Trivi
7e2f371736 AudioService: force use impacts BECOMING_NOISY intent 
Update the list of audio devices that cause the
  ACTION_AUDIO_BECOMING_NOISY intent to be broadcast according
  to the FOR_MEDIA forced configuration.
Synchronize access to list of "noisy" audio devices on the
  connected devices, as it can be updated from different
  threads.

Bug 18313377

Change-Id: Iffd95861d0796691350b0e19b596dd1db0567836
 2015-01-14 13:42:25 -08:00
Eric Laurent
bd0e6c36d5 am e5a25a76: am ad58ca67: Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev automerge: 50085fb 
* commit 'e5a25a7689d3b2c8f6e0a047f6dd27f9d6c19ae4':
  AudioService: handle stream mute by stream alias
 2015-01-14 21:13:47 +00:00