1496 Commits

Author SHA1 Message Date
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
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
Bryan Mawhinney
fbc616474b am c6bbc4e7: am 9de61ae0: Merge "Fix video scaling mode validity check." into jb-dev
* commit 'c6bbc4e70f8fe41dd31de3c8a0e9be0f24961593':
  Fix video scaling mode validity check.
2012-05-21 12:42:50 -07:00
Jeff Brown
bb4811be3c am 031ffb15: am 7852a59d: Merge "Use FLAG_LONG_PRESS for headset long press interactions." into jb-dev
* commit '031ffb15acb6db931488f20dc8af86864c5d5ca7':
  Use FLAG_LONG_PRESS for headset long press interactions.
2012-05-21 12:42:10 -07:00
Jean-Michel Trivi
eafa73e4dc am 1644f0d9: am 0a95ce9f: Merge "Handle media button events during phone calls and when ringing" into jb-dev
* commit '1644f0d9ee72cf37f0b92a7b5ef44bfac1421bab':
  Handle media button events during phone calls and when ringing
2012-05-21 12:40:38 -07:00
Marco Nelissen
87ba92fa39 am ec733f09: am d88404d0: Merge "Fix .pls playlist parsing" into jb-dev
* commit 'ec733f094b48882b78ccf00b0ade5a46229c41c3':
  Fix .pls playlist parsing
2012-05-21 12:40:08 -07:00
Jean-Michel Trivi
3c2711fc28 Type of search on headset key long press must depend on device state
When the user long presses on the headset key, the type of search
 that will launched must depend on the state of the device. The
 following logic is implemented:
 - screen on and device unlocked: action is ACTION_WEB_SEARCH,
 - device locked or screen off: action is ACTION_VOICE_SEARCH_HANDS_FREE
    with EXTRA_SECURE set to true if the device is securely locked.

Bug 6518222

Change-Id: I318770346b8d83e44dfcd4154bcdb517ea7098b5
2012-05-21 10:59:44 -07:00
Bryan Mawhinney
9de61ae0ed Merge "Fix video scaling mode validity check." into jb-dev 2012-05-17 16:19:30 -07:00
Bryan Mawhinney
79a9cd40f5 Fix video scaling mode validity check.
Change-Id: Ib7adead2758d50cae67741364801e966a82ad5ba
2012-05-18 00:15:56 +01:00
Jeff Brown
ab624c2fd4 Use FLAG_LONG_PRESS for headset long press interactions.
Handle canceled key events correctly and don't synthesize
key events in that case.

Unfortunately, the state machine was confused by some sequences
of key events that it might receive from the input dispatcher
when new activities take focus during a long-press on the headset key.
The audio service may receive a cancel event intended for the old
window, followed by a repeated down and finally an up for the new window.
Simplified this down to just two booleans.

Bug: 6484717
Change-Id: I9587d0a5e282419ef4d7c17665940682aacea96a
2012-05-17 14:00:34 -07:00
Jean-Michel Trivi
0a95ce9ffb Merge "Handle media button events during phone calls and when ringing" into jb-dev 2012-05-17 11:14:56 -07:00
Jean-Michel Trivi
722b808662 Handle media button events during phone calls and when ringing
Add functionality in AudioManager/AudioService to register a
 media button receiver for telephony that, when registered, gets
 priority for media button key events during a phone call or
 when ringing.

Bug 6484717

Change-Id: I0835fc02cb24d06ca59af5a32c3ba0ae93e54442
2012-05-17 10:38:36 -07:00
Marco Nelissen
538d4925b3 Fix .pls playlist parsing
b/6508278

Change-Id: I015ecf3fa599601ba4e9d018be24d0685e153239
2012-05-16 17:10:24 -07:00
Eric Laurent
50e8a1649a am dd99f70a: am dfae6db0: Merge "Implement new volume display policy." into jb-dev
* commit 'dd99f70a3f8e661799ecda271d31fc385a80ecb5':
  Implement new volume display policy.
2012-05-15 11:38:37 -07:00
Jean-Michel Trivi
ba128896f3 am 45274f72: am 2411c336: Merge "Verify AudioTrack only uses a valid multichannel configuration" into jb-dev
* commit '45274f729e9d9d1d9bee3007a949d531abdb31a2':
  Verify AudioTrack only uses a valid multichannel configuration
2012-05-14 19:37:41 -07:00
Eric Laurent
8c78752f2b Implement new volume display policy.
Whenever a stream type is muted, the progress bar in volume panel
is at 0.
If a stream is muted by ringer mode and does not control ringer mode,
the progress bar is disabled.
Pressing VOL- when in vibrate or silent mode resets the last audible
volume of ringtone stream (music strem on tablets) to 0.

VolumePanel implementation:
 - Always prefer AudioManager APIs over AudioService APIs when available on both.
 - Do not use AudioManager.shouldVibrate() (deprecated).

Change-Id: I57fcb19ada4e8d729b6b41d668496562ebe340c3
2012-05-14 14:13:10 -07:00
Jean-Michel Trivi
d9e587137b Verify AudioTrack only uses a valid multichannel configuration
Enforce the same rules as for HDMI output:
- FL/FR must be present
- paired channels must be used in pairs (e.g. no rear left
   without rear right)

Bug 6392126

Change-Id: I0a39e474dcf509cb7eabd8edd1f0e44852d72b51
2012-05-14 08:49:42 -07:00
Jean-Michel Trivi
d8be1b9e67 am 3d486406: am 2d97a70f: Merge "Start voice-based interactions from headsethook key" into jb-dev
* commit '3d486406ab510dfab0e4b6913de90be9486074ad':
  Start voice-based interactions from headsethook key
2012-05-14 08:37:47 -07:00
James Dong
16ff4fbab7 am f4513bb9: am 909c4b85: Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev
* commit 'f4513bb95b6c8b831b747bf08accd74f96ce712b':
  Improve notifying TimedText by reducing marshall/unmarshalling.
2012-05-14 08:36:21 -07:00
Jean-Michel Trivi
2d97a70ff8 Merge "Start voice-based interactions from headsethook key" into jb-dev 2012-05-12 08:06:28 -07:00
James Dong
909c4b855a Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev 2012-05-11 16:45:19 -07:00
Jean-Michel Trivi
4294b83927 Start voice-based interactions from headsethook key
Implement the interception of long-press on keys that
 can be used to trigger voice-based interactions (here
 only HEADSETHOOK) only if the long-press hasn't been
 trapped by the foreground application:
 - if the key is not one that is used for voice input, handle
   the event as before.
 - if the key press wasn't long enough, simulate a delayed
   key press.
 - if long press is detected, send
   RecognizerIntent.ACTION_WEB_SEARCH. Long press duration
   is set to 300ms (a typical key press is under 100ms).

Bug 3225090

Change-Id: I5b3adeb91d3c41ccd54d23fdb93d7eaec496eee7
2012-05-10 18:42:31 -07:00
Mike Lockwood
e3f70c6545 am f61adad3: am 8d8176d4: Merge "AudioService: Fix problem handling USB audio disconnect" into jb-dev
* commit 'f61adad3a7aab104b8c98625fa0e986341ada0d2':
  AudioService: Fix problem handling USB audio disconnect
2012-05-10 18:04:33 -07:00
Mike Lockwood
8d8176d41b Merge "AudioService: Fix problem handling USB audio disconnect" into jb-dev 2012-05-10 17:58:47 -07:00
Mike Lockwood
9841818b9a AudioService: Fix problem handling USB audio disconnect
Also broadcast ACTION_AUDIO_BECOMING_NOISY on USB audio disconnect

Change-Id: I46dfcc744df880066aea6bf651334a081c14af0f
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-05-10 17:49:30 -07:00
Eric Laurent
91812e4305 am d2261486: am 304521b7: Merge "AudioService: fix various volume issues." into jb-dev
* commit 'd2261486fa7c789cce5642034d294220f13f6cb0':
  AudioService: fix various volume issues.
2012-05-10 17:47:26 -07:00
Eric Laurent
2448201852 AudioService: fix various volume issues.
Fix various issues in adjustStreamVolume() related to stream type aliases
using different ranges.

Always Update last audible index on all streams sharing the same alias.

Add check on setRingerMode() to prevent setting mode to VIBRATE when no
vibrator is present.

Issue 6455831.

Change-Id: Id110e05d2f16e208e1e398922617bf31967b62db
2012-05-10 17:20:26 -07:00
Eric Laurent
98d8fcf646 am faf23358: am 24938df9: Merge "AudioService: synchronized access to volume index" into jb-dev
* commit 'faf233585b5f3338cb39ab1aeb97891c0e25b273':
  AudioService: synchronized access to volume index
2012-05-10 15:26:56 -07:00
Eric Laurent
24938df9e4 Merge "AudioService: synchronized access to volume index" into jb-dev 2012-05-10 15:20:08 -07:00
Eric Laurent
3172d5e3e7 AudioService: synchronized access to volume index
Add synchronization to prevent concurrent accesses to
volume indexes HashMap in VolumeStreamState.

Use ConcurrentHashMap for VolumeStreamState mIndex and
mLastAudibleIndex.

Issue 6421841.

Change-Id: I6dee805a79aa5e2cd0ba4072014a2fcdda4ed507
2012-05-10 14:55:20 -07:00
Dianne Hackborn
d293b4b339 am 1ccc8953: am e2c7e2ad: Merge "Add compression level key for FLAC encoding" into jb-dev
* commit '1ccc8953a0ef17076fc2f8088159556c70fbb9c5':
  Add compression level key for FLAC encoding
2012-05-10 11:38:59 -07:00
Jean-Michel Trivi
08fb063f07 Add compression level key for FLAC encoding
Change-Id: Ic4c32694841b6f37ca44061d14bb81fc267696cc
2012-05-09 19:16:14 -07:00
Andreas Huber
610ac933fc am 039495d3: am ea86b36f: Merge "Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no" into jb-dev
* commit '039495d3dc19b96e3953fde81b74c44d0ac5c2f0':
  Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no
2012-05-09 13:27:03 -07:00
Andreas Huber
f86374adec Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no
sense for the java API.

Change-Id: I3f2eabb5ca5ffb6c1f03141bfd303310111e8774
related-to-bug: 6276111
2012-05-09 11:32:51 -07:00
James Dong
dc8967edf0 am 4c2a7bdf: am 3b5fdf51: Merge "Fix: Missed parcel recycling in MediaPlayer." into jb-dev
* commit '4c2a7bdf21ae2f1cba8abfbffa1ea749e2eaaa39':
  Fix: Missed parcel recycling in MediaPlayer.
2012-05-09 10:10:58 -07:00
Eric Laurent
ec9323509d am 776339fe: am c8ade15d: Merge "Silent and Vibrate mode clean up" into jb-dev
* commit '776339fe4c6254fd8e344496a793ce4a11b6f450':
  Silent and Vibrate mode clean up
2012-05-09 10:10:07 -07:00
Andreas Huber
c34df8ba52 am 17b3420f: am c2182c67: Merge "Clarification of MediaCodec behaviour when codec specific data is included" into jb-dev
* commit '17b3420f4e1edcf4a0e5460fbe9f4fb3cd49faca':
  Clarification of MediaCodec behaviour when codec specific data is included
2012-05-09 10:09:35 -07:00
Insun Kang
8902097bb6 Improve notifying TimedText by reducing marshall/unmarshalling.
o Removes mParcel from TimedText class.
o Converts native parcel into java parcel object directly without
copying to an intermediate byte array.
o JNIMediaPlayerListener::notify checks for Java exceptions, logs them,
and clears the exception state.

related-to-bug: 6405934

Change-Id: I8b82d3cd5b9b3ef8cad27e805202a0e445a88a45
2012-05-09 20:14:09 +09:00
James Dong
3b5fdf510b Merge "Fix: Missed parcel recycling in MediaPlayer." into jb-dev 2012-05-08 18:29:44 -07:00
Eric Laurent
bffc3d1bd3 Silent and Vibrate mode clean up
Clean up related to new Vibration policy.
The vibrate behavior is now only derived from:
 - presence of a vibrator on the device
 - current ringer mode selected: NORMAL, VIBRATE or SILENT
If no vibrator is present the ringer mode can only be NORMAL or SILENT.

The control of ringer mode via volume keys when volume keys control the "master"
stream type (RING on phones, MUSIC on tablets) is as follows:
If a vibrator is present:
 VOL- and volume equals 1: NORMAL => VIBRATE
 VOL- and volume equals 0 and not continuous press: VIBRATE => SILENT
 VOL+ and in SILENT mode: SILENT => VIBRATE
 VOL+ and in VIBRATE mode: VIBRATE => NORMAL, volume = 1
If no vibrator is present:
 VOL- and volume equals 0 and not continuous press: NORMAL => SILENT
 VOL+ and in SILENT mode: SILENT => NORMAL, volume = 0

VIBRATE_ON and VIBRATE_IN_SILENT settings are not stored/retreived any more.

AudioService checks and corrects ringer mode and stream volumes if necessary when reading from
DB at boot time.

Also:
 Added dump for stream volumes in AudioService.
 Added device names missing in AudioSystem for USB accessory and USB device.

Issue: 6036529
Issue: 6414950
Issue: 6448163

Change-Id: I77fb821ec63e4e566320cac2701b4ac466e86aef
2012-05-08 15:10:37 -07:00
Andreas Huber
8aa735f71e Clarification of MediaCodec behaviour when codec specific data is included
in the format passed to configure().

Change-Id: I150f52e8092c0f7d897891f02ba6b1d89b6230f4
related-to-bug: 6364139
2012-05-08 11:33:12 -07:00
Jeff Sharkey
54cb5592b6 am 83abfb3c: am 476b03b0: Merge "Handle silent ringtone, title without permission." into jb-dev
* commit '83abfb3cab53314fd5a7601e427b4b8b714f6f06':
  Handle silent ringtone, title without permission.
2012-05-08 11:32:45 -07:00
Jeff Sharkey
1d8e5c5880 Handle silent ringtone, title without permission.
Silent ringtones have a valid Uri, but isn't openable by MediaPlayer,
so treat as no-op playback instead of throwing.  Also handle missing
permissions when resolving title.

Bug: 6448074, 6447538
Change-Id: I656675d7fc2e78a6ba05824e13bdd43193fcfdf2
2012-05-07 13:30:10 -07:00
Insun Kang
be0ea968bf Fix: Missed parcel recycling in MediaPlayer.
Change-Id: I2c99f771b33bf627af10e8baea455181558360e6
related-to-bug: 6405934
2012-05-07 11:31:18 +09:00
Andreas Huber
4b27a9133e am 9d8aa0e4: am c52c957c: Merge "Various changes to Media* APIs requested by the api council." into jb-dev
* commit '9d8aa0e4ac0498e2a139bd60342d986c42251e2b':
  Various changes to Media* APIs requested by the api council.
2012-05-04 08:58:22 -07:00
Andreas Huber
c52c957c45 Merge "Various changes to Media* APIs requested by the api council." into jb-dev 2012-05-04 08:53:23 -07:00
Christopher Tate
f131611d03 resolved conflicts for merge of b89ce434 to master
Change-Id: Ida7ef25adc2f4b9f22d8662c9f0e8a1ec9df0d55
2012-05-03 18:18:34 -07:00
Andreas Huber
60d610bf10 Various changes to Media* APIs requested by the api council.
Change-Id: Iec2f50c99cf5f00a442737231361334e9ab46340
related-to-bug: 6432753
2012-05-03 16:02:29 -07:00
Christopher Tate
b89ce43499 Add streamlined config-based path for no volume key sounds
This lets us avoid a Binder roundtrip to the system process during
volume changes.  Previously volume change would be staged at key-down,
then applied at key up in tandem with playback of the sonic feedback
about volume key presses.  The reason for this two-stage handling was
to defer playback of the sound [at the target volume] while the volume
key was being held for repeat.

On some devices volume is always sent as key down/up pairs rather than
down-repeat-up sequences. On these devices it is more efficient to
apply the new volume immediately during down handling, and have the
up handling be a no-op.  This CL adds a configuration resource item
selecting this new fast path.

Bug 6433943

Change-Id: Icffa56e958243b841d514e2fe4609ba3a7b20f14
2012-05-03 15:41:34 -07:00