6497 Commits

Author SHA1 Message Date
Adam Powell
b85afc25d5 resolved conflicts for merge of 1178569b to master
Change-Id: If2bb6ccaee99bcf199cd93f24eba217fe6ff485e
2012-06-05 20:08:41 -07:00
Adam Powell
690ffb4e1f More fun with MediaRouter
Add action provider, button, and styles. Extend ActionProvider to
allow for getting references to MenuItem instances.

Implement toggle mode for the MediaRouteButton/ActionProvider. Dialog
selection yet to come.

Change-Id: Ibe3188570f503bbf8dd00cf154663435656a7171
2012-06-05 19:15:57 -07:00
Jean-Michel Trivi
c55b393efd Configuration for lock and UI sound levels
Define two integers in the platform configuration to
 define the sound level for lock/unlock sounds, and
 UI sound effects.
Use the corresponding value in KeyguardViewMediator for the lock sounds.
Use the corresponding value in AudioService when playing sound effects.

Bug 6448481

Change-Id: Ie238f5eb1645e395412864d93447ac4049f7e54b
2012-06-05 16:58:20 -07:00
Jack Palevich
481a714a57 am 1d340500: am 0c01222f: Merge "Don\'t crash when scaling Bitmaps with private Bitmap.Configs" into jb-dev
* commit '1d34050087b5e134719f7a917c7ded3de090d0b2':
  Don't crash when scaling Bitmaps with private Bitmap.Configs
2012-06-05 09:21:28 -07:00
Mathias Franzén
2fe37b7005 Added mpga as valid MediaFile extension
Added mpga as a valid media file extension, it is treated as mp3.

Change-Id: Ie39036d61b6ca50439861fa10be0d824dcc65ed3
2012-06-05 08:20:16 +02:00
Jack Palevich
05c66cc5cc Don't crash when scaling Bitmaps with private Bitmap.Configs
Bug: 6526197
Change-Id: I89f008f90888f0a679274c00293342ab0fb0e28e
2012-06-04 16:15:47 +08:00
Adam Powell
a55a94bfb3 am 58e29c06: am 7c86958d: Merge "Add MediaRouter API." into jb-dev
* commit '58e29c06610054419339bb0a75c44ab30d6fe89a':
  Add MediaRouter API.
2012-06-03 14:19:07 -07:00
Adam Powell
7c86958d73 Merge "Add MediaRouter API." into jb-dev 2012-06-03 14:11:43 -07:00
Ruei-sung Lin
4a01bce39a am 0b5f8ac1: am 56f6c7ff: Merge "Fix b/6575950 make shader program to support different precisions." into jb-dev
* commit '0b5f8ac125d4e16071df8a47083edc8fa7a1f63b':
  Fix b/6575950 make shader program to support different precisions.
2012-06-02 08:40:20 -07:00
Ruei-sung Lin
56f6c7ff09 Merge "Fix b/6575950 make shader program to support different precisions." into jb-dev 2012-06-01 19:42:22 -07:00
Adam Powell
9a1de308ce Add MediaRouter API.
This is just the initial state tracking. Still to go is
actually triggering Bluetooth A2DP correctly and tracking
process state in the system server.

Change-Id: I33031d52799d6e2d7208910da833831085cc3677
2012-06-01 18:19:20 -07:00
Jean-Michel Trivi
2b6340a257 am c7d8d370: am b40c0b5a: Merge "Handle wakelocks for device connection intents from AudioService" into jb-dev
* commit 'c7d8d37051ba46e37a586f4ea5f4e662a347171a':
  Handle wakelocks for device connection intents from AudioService
2012-06-01 09:04:06 -07:00
Jean-Michel Trivi
2d8dab5a54 Handle wakelocks for device connection intents from AudioService
Now that AudioService handles the device connection intents itself,
 those need to be sent under wakelock.
 The wake lock is acquired when AudioService is notified of the
 device connection, and released when the corresponding message
 has been handled.
This change only covers the device connection messages, and doesn't
 affect the handling of the other AudioService messages.

Bug 6485897

Change-Id: I2d35f5404f097b5adde8af21fd81347bdd5576a6
2012-05-31 08:58:01 -07:00
Eric Laurent
846890957d am c383b407: am cee7203f: Merge "Send device connection intents from AudioService" into jb-dev
* commit 'c383b407ad24474b87de68f93ea95de495f6d2c1':
  Send device connection intents from AudioService
2012-05-31 08:29:29 -07:00
Eric Laurent
cee7203f9a Merge "Send device connection intents from AudioService" into jb-dev 2012-05-31 08:22:50 -07:00
James Dong
f517b04889 am 9ff7d5db: am 7b996d19: Fix a test case failure when there is no back-facing camera on a device
* commit '9ff7d5db8805255429ebf8a308e352f98c1981d0':
  Fix a test case failure when there is no back-facing camera on a device
2012-05-30 22:51:31 -07:00
James Dong
7b996d19af Fix a test case failure when there is no back-facing camera on a device
Change-Id: I427b2e03b266ff2d92c6fe64f732a256d285020e
related-to-bug: 6538628
2012-05-30 20:36:12 -07:00
Eric Laurent
b1fbaaccb6 Send device connection intents from AudioService
AudioService is currently notified of wired headset and A2DP
sink connection states via broadcast intents from WiredAccessoryObserver
and BluetoothA2dpService. This is a problem as there is no guaranty that
AudioService can take actions upon the change before other apps are notified.
For instance, the Play On feature requires the UI to be refreshed when a device
is inserted/removed and we must guaranty that the UI component can read
new A2DP enable state from AudioManager after it receives a device connection state
change intent.

- Added hidden methods to AudioManager so that WiredAccessoryObserver
and BluetoothA2dpService can notify AudioService of device connection directly.
- The wired accessories connection intents are now sent by AudioService.
- The A2DP state change intent is delayed by BluetoothA2DPService when
ACTION_AUDIO_BECOMING_NOISY is sent by AudioService
- ACTION_AUDIO_BECOMING_NOISY intent is not sent when disconnecting A2DP
while a wired headset is present and vice versa.

Bug 6485897.

Change-Id: Ie160b3ee5f451132065530772b868593c90afd94
2012-05-30 14:44:43 -07:00
James Dong
4d3588f012 am affa374b: am fb910e8f: Merge "Fixed a buffer overflow issue" into jb-dev
* commit 'affa374bae25042ecd5a0a67acd6cd981133cb14':
  Fixed a buffer overflow issue
2012-05-29 18:28:22 -07:00
James Dong
54c40e033e Fixed a buffer overflow issue
The allocated array has one byte less than the required length. Allocating the size one byte larger fixes the issue.
contribution was originally from teng.hong@nxp.com

Change-Id: I3aa2e6b995fd18e30649a34f201646082aab44ee
related-to-bug: 6347465
2012-05-29 18:08:51 -07:00
Ruei-sung Lin
0a10132292 Fix b/6575950 make shader program to support different precisions.
1. In shade code of Vignette and Fisheye, change from
   pixel coordinates to texture coordinates to avoid overflow.

2. Fix bug in ColorTemperature shader code

3. Revise shader code pseudo random number generator (used by
   BlackWhite, Grain, Lomo, Documentary filters) to ensure
   it produces no artifacts among devices with different precisions.

Change-Id: Ifb67f12f114bc9cd7fbfa74f7782f130c5244e5d
2012-05-29 15:52:45 -07:00
Bryan Mawhinney
fc11edb05a am 592a3f54: am c3a5cf9a: Actually set the video scaling mode :-)
* commit '592a3f544745f19d9901692700a1b439b9f8c57b':
  Actually set the video scaling mode :-)
2012-05-27 12:53:48 -07:00
Bryan Mawhinney
c3a5cf9aab Actually set the video scaling mode :-)
Change-Id: Ia3e77b68a07651861e9be268ab77cac808b3be79
2012-05-27 17:42:46 +01:00
Christopher Tate
c0ed6efe5f am 115284bc: Merge "Support volume-changed sounds on master-volume-only configs" into ics-aah
* commit '115284bc124ce2874f32ad36956f475959513388':
  Support volume-changed sounds on master-volume-only configs
2012-05-25 11:57:35 -07:00
Christopher Tate
115284bc12 Merge "Support volume-changed sounds on master-volume-only configs" into ics-aah 2012-05-25 11:55:04 -07:00
Jean-Baptiste Queru
735470d202 am 23cad6eb: Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"
* commit '23cad6eb2b42f023a8f2197cd358de87f9084b99':
  stagefright aacenc: Fix reading out of bounds in pow2_xy
2012-05-25 11:34:02 -07:00
Jean-Baptiste Queru
23cad6eb2b Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy" 2012-05-25 10:38:06 -07:00
Martin Storsjo
9af8cfa60f stagefright aacenc: Fix reading out of bounds in pow2_xy
This fixes cases where x was a large number, causing fPart to
exceed the 32 bit signed integer range (while fitting in an
unsigned 32 bit integer), making the table index a negative
number.

Change-Id: I674047db65f89148a93d218c138b42cd8305f80e
2012-05-25 19:49:59 +03:00
John Grossman
03f2fb3cb9 AAH_RX: Add the ability to control volume and stream type.
DO NOT MERGE

Change the AAH_RX player so that it implements MediaPlayerHWInterface
(instead of just MediaPlayerInterface) so the app level can control
the rendering volume of individual RX player instances as well as the
stream type of the audio tracks created by the RX player.

Change-Id: Ieff1ea774f7981227546744883ee4b4e87a2cd2a
Signed-off-by: John Grossman <johngro@google.com>
2012-05-24 17:48:17 -07:00
Christopher Tate
c4b78d206f Support volume-changed sounds on master-volume-only configs
Some products manipulate only the master volume, and the existing
code does not play volume-change tones when the master volume
is adjusted.  This CL includes some config-driven behavior that
will play those tones (via the system stream) if desired.

Bug 6498986

Change-Id: I2415773325d0a0039efc67897bc371b1f2e18063
2012-05-24 17:30:39 -07:00
Eric Laurent
aa5481214f am dcc752a8: am 90fb2dd6: Merge "AudioManager: restore setBluetoothA2dpOn() method" into jb-dev
* commit 'dcc752a8984361ba23da00bf2adeec4161b67af2':
  AudioManager: restore setBluetoothA2dpOn() method
2012-05-24 11:47:48 -07:00
Eric Laurent
90fb2dd673 Merge "AudioManager: restore setBluetoothA2dpOn() method" into jb-dev 2012-05-24 11:39:36 -07:00
Fabrice Di Meglio
c30d1ad8f3 am 07e28d1e: am 0100625b: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
* commit '07e28d1e9bd7373c83cb66d5d9e93ae9af1f090d':
  Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
2012-05-24 11:13:42 -07:00
Fabrice Di Meglio
0100625bb3 Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev 2012-05-24 10:42:23 -07:00
Jean-Baptiste Queru
f75b605213 am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7"
* commit '55536138cc0febbe83608ee0103aaa9a5202e31f':
  libstagefright/matroska: Fix build with gcc 4.7
2012-05-24 07:59:28 -07:00
Jean-Baptiste Queru
55536138cc Merge "libstagefright/matroska: Fix build with gcc 4.7" 2012-05-24 06:53:51 -07:00
Jean-Baptiste Queru
fe34006d6f am 05cd296e: Merge "libmedia: Fix build with gcc 4.7"
* commit '05cd296e713377c216a4ac5b2d421f4ca0343cda':
  libmedia: Fix build with gcc 4.7
2012-05-24 06:43:50 -07:00
Jean-Baptiste Queru
05cd296e71 Merge "libmedia: Fix build with gcc 4.7" 2012-05-24 06:25:55 -07:00
Wu-cheng Li
dd850c7903 am a039119e: am c1cabdfb: Merge "Fix bad aspect ratios for recorded effects" into jb-dev
* commit 'a039119e6806d17e0cc9d0e0e249f66525853935':
  Fix bad aspect ratios for recorded effects
2012-05-23 18:02:49 -07:00
Wu-cheng Li
c1cabdfbbb Merge "Fix bad aspect ratios for recorded effects" into jb-dev 2012-05-23 17:57:23 -07:00
Pannag Sanketi
58acf44b9f Fix bad aspect ratios for recorded effects
Fix b/6530189
Fix b/6535207
Change-Id: I6ef09bd619acc31af53d9991335cda33b7c08908
2012-05-23 16:40:31 -07:00
Fabrice Di Meglio
13fe2a5330 Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
- use an ID instead of a String for StorageVolume description
- use this ID for getting the correct localized version of the description string

Change-Id: I30f3080fce2c889be38bfdf9f5121dffcf8a99e8
2012-05-23 16:38:09 -07:00
Marco Nelissen
738342b1dc am ec1d16bf: am 101fb9fe: Merge "Handle _ and % in paths" into jb-dev
* commit 'ec1d16bf72d68604e7dc86309f13d909a6d88321':
  Handle _ and % in paths
2012-05-23 07:49:15 -07:00
Marco Nelissen
b4b847866f Handle _ and % in paths
When doing a "like" match on a path, add a second non-like constraint
so that sqlite wildcard characters don't match arbitrary other characters.
b/6501408

Change-Id: I21f9b1c2d8e7c7ef27c0ad5fe24c3e01cd67fb61
2012-05-22 16:30:34 -07:00
Eric Laurent
7847211fb4 AudioManager: restore setBluetoothA2dpOn() method
Remove deprecation on setBluetoothA2dpOn() method so that applications
can override the default audio policy which is to use A2DP
for media whenever connected.

The request is not persistent and the default policy is restored when a
new A2DP i ro wired headset connection occurs.

Bug 6485897.

Change-Id: I2a4b6b6bdba55f7b133e64f86d27c03eb86acfa4
2012-05-22 16:06:21 -07:00
Jean-Michel Trivi
16353830e6 am 483ef81e: am fca91a8e: Merge "Type of search on headset key long press must depend on device state" into jb-dev
* commit '483ef81e0e6fdd6965ad18e44a5347a85e7db4cb':
  Type of search on headset key long press must depend on device state
2012-05-21 15:43:35 -07:00
Jean-Michel Trivi
fca91a8e6a Merge "Type of search on headset key long press must depend on device state" into jb-dev 2012-05-21 15:36:55 -07:00
Jean-Baptiste Queru
ce5b506ef7 am 64f77c5e: Merge "stagefright avcenc: Use intptr_t for casting pointers to integers"
* commit '64f77c5e312ff0b45a91853f782f112a99df758f':
  stagefright avcenc: Use intptr_t for casting pointers to integers
2012-05-21 14:52:48 -07:00
Jean-Baptiste Queru
7bce428ccc am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting"
* commit '6fd507b92746481f63922059697226c8ec6ad72b':
  stagefright avcenc: Switch tmp variables to use the right type, to avoid casting
2012-05-21 14:52:45 -07:00
Pannag Sanketi
7ed2b1ffb2 am 2b876783: am 850c2c36: Merge "Fixing the weird preview size w/ effects on camera" into jb-dev
* commit '2b8767837b19edd49999572e1979f0cde09d6544':
  Fixing the weird preview size w/ effects on camera
2012-05-21 14:29:40 -07:00