65360 Commits

Author SHA1 Message Date
Jean-Michel Trivi
4ed37ea81a Bug 5567648 Request and abandon audio focus in calls
Up to now, audio focus was implicitly requested and abandoned
 when changing the audio mode. This is no longer the case so the
 behavior with regards to audio focus can be indepently set by
 the CallManager.
The logic implemented here is the same as the one previously used
 in AudioService:
  - only request audio focus when the ring volume index is > 0
    when ringing,
  - request focus before setting the audio mode to a mode other
    than normal
  - abandon audio focus after setting the audio mode to normal

Change-Id: Ia543dc779563dbff09414771fee60e589dfaab9d
2012-01-27 14:20:27 -08:00
Jean-Michel Trivi
11001c344a Merge "Bug 5567648 disassociate audio mode and audio focus" 2012-01-27 14:15:37 -08:00
Glenn Kasten
b975ae45cb Merge "Remove optional LVMX service" 2012-01-27 14:11:16 -08:00
Jean-Baptiste Queru
27d2ab8b27 am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit 'dc8668c8a727a065cbe48c89c900d2fe98e12ab3':
  Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 13:58:03 -08:00
Jean-Baptiste Queru
dc8668c8a7 am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '9781870491f4f33403f8d518879a88c20180d7cb':
  Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 13:55:56 -08:00
Gilles Debunne
566e8baf43 Merge "Fix for IOOB when suggestions have disappeared" 2012-01-27 13:54:50 -08:00
Gilles Debunne
ea1181220d Merge "Handle tap and move cursor before showing suggestions" 2012-01-27 13:54:42 -08:00
Teng-Hui Zhu
913917449d Merge "Revert "Hack to workaround the fact that the EGL context can be"" 2012-01-27 13:48:25 -08:00
Jean-Baptiste Queru
9781870491 Merge "Wi-Fi: Handle disconnect in middle of DHCP operation" 2012-01-27 13:36:49 -08:00
Jean-Michel Trivi
4dd3674e51 Bug 5567648 disassociate audio mode and audio focus
Don't automatically change the audio focus when
 the audio mode changes. This is best handled by the
 applications that change the audio mode so they
 can address their usecases as they please (for
 instance to define the behavior when switching calls).
Replaced the implicit "mode to focus" behavior with
 two methods to request and abandon audio focus. These
 methods are only to be used by the framework, and maintain
 the logic in AudioService to prevent other apps to request
 audio focus during a call.
A susequent change will update com.android.internal.telephony.CallManager
 to take advantage of these two methods.

Change-Id: If84ebd508e985083e8cac82ece44940c72b5c669
2012-01-27 13:32:45 -08:00
Glenn Kasten
882c0a20c5 Use audio_in_acoustics_t consistently
Change-Id: I0a9dd668fb2e57b1c3ece3190588194974b99062
2012-01-27 13:31:54 -08:00
Vishal Mahaveer
21bd79f51c Wi-Fi: Handle disconnect in middle of DHCP operation
Restore power mode and BT co-ex settings when disconnect
happens in middle of DHCP operation.

Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-01-27 14:51:23 -06:00
Eric Fischer
d4760fc2b7 Merge "Import translations. DO NOT MERGE" 2012-01-27 11:58:58 -08:00
Eric Fischer
fb197c2654 Import translations. DO NOT MERGE
Change-Id: I853c3fd2a3ada0c78e461550dc6c61bb5e09404a
2012-01-27 11:55:32 -08:00
Eric Fischer
b6c51b9a88 Import translations. DO NOT MERGE
Change-Id: I16defb344c5a4a253bc34b414f6395a785bd7003
2012-01-27 11:51:46 -08:00
Glenn Kasten
de57586c90 Remove optional LVMX service
Change-Id: I64121d320b756e46869b82b79e49aebacbac3a48
2012-01-27 11:25:51 -08:00
Eric Fischer
66ed857806 Merge "Mark locale-neutral configuration strings translatable="false"" 2012-01-27 11:22:52 -08:00
John Wang
2c911b2416 Adjust the LTE signal bar mapping.
The new mapping are

  Four  bars: RSRP >= -95dBm
  Three bars: -105 dBm <= RSRP < -95 dBm
  Two   bars: -115 dBm <= RSRP < -105 dBm
  One   bars: RSRP < -115 dBm
  No    bars: No Service

bug:5640958
Change-Id: I9efabaeac33b624ea0a58a4d3760169dff6544f6
2012-01-27 11:05:24 -08:00
Eric Fischer
53ebe33e76 Mark locale-neutral configuration strings translatable="false"
Change-Id: I344b871553339b9d98b7bfed74be02dc85b4e195
2012-01-27 11:04:23 -08:00
Nick Pelly
d343bb9692 Merge "Fix doc bug." 2012-01-27 11:03:57 -08:00
Nick Pelly
d3cb80d2af Fix doc bug.
Change-Id: Ib7361abb0461d4295e889c505dd45e3a40193451
2012-01-27 11:03:05 -08:00
Nick Pelly
fbc659e259 Merge "Fix build: update current.txt" 2012-01-27 10:35:12 -08:00
Nick Pelly
21c136a4ec Fix build: update current.txt
Change-Id: Ic28314e98784ebe513bd2191d3fa6c9bd5674422
2012-01-27 10:34:18 -08:00
Stephen Hines
cee905be48 Merge "Don't wait forever if there are no commands to execute." 2012-01-27 10:08:18 -08:00
Nick Pelly
ef78d96b90 Merge "Add NdefMessage.getByteLength(), and more minor fixes:" 2012-01-27 09:59:10 -08:00
Jamie Gennis
7bea650208 Merge "SurfaceTexture: use fence sync on omap4 & s5pc110" 2012-01-27 09:53:14 -08:00
Glenn Kasten
c14639a9a1 Merge "Use audio_source_t consistently" 2012-01-27 09:06:00 -08:00
Glenn Kasten
c1f63ddba7 Merge "AudioStreamIn and AudioStreamOut" 2012-01-27 07:22:30 -08:00
Glenn Kasten
6562dadf3c Merge "Declare methods in binder opcode order" 2012-01-27 07:19:53 -08:00
Glenn Kasten
591993f162 Merge "Use enum effect_state consistently" 2012-01-27 07:19:10 -08:00
Glenn Kasten
86012869b8 Merge "Use enum track_state consistently" 2012-01-27 07:18:23 -08:00
Glenn Kasten
43f4dd4fa1 Merge "Use enum mixer_state consistently" 2012-01-27 07:16:46 -08:00
The Android Automerger
6d0e26b763 merge in ics-mr1-release history after reset to ics-mr1 2012-01-26 18:32:07 -08:00
Stephen Hines
e3f9cc6761 Don't wait forever if there are no commands to execute.
BUG=5614887

This fixes a timing issue where we could calculate a delay of 0 (indicating
wait forever) when we have no pending commands to actually execute. In such
cases, we should just break out of the playback loop.

This also fixes a small issue with returning whether or not to redraw.

Change-Id: Id1e481679341773256b7287062c68925e2bc8f9e
2012-01-26 17:32:09 -08:00
Alon Albert
815af1ff59 Merge "Throw NPE if s is null" 2012-01-26 17:05:58 -08:00
Glenn Kasten
0f0fbd9441 Use audio_source_t consistently
Was a mix of audio_source_t, uint8_t, and int.

Related fixes:
 - fix comments in MediaRecorder.java
 - AudioPolicyService server side was not checking source parameter at
   all, so if the client wrapper was bypassed, invalid values could be
   passed into audio HAL
 - JNI android_media_AudioRecord_setup was checking source for positive
   values, but not negative values. This test is redundant, since already
   checked at Java and now checked by AudioPolicyService also, but might
   as well make it correct.

Change-Id: Ie5e25d646dcd59a86d7985aa46cfcb4a1ba64a4a
2012-01-26 16:50:19 -08:00
Roman Nurik
5525a43a9c am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
* commit '639b25ea289481da6cfd4229649b51ffc6ce3406':
  docs: add NOTICE to action bar icon pack and sprinkle download links
2012-01-26 16:35:06 -08:00
Roman Nurik
639b25ea28 Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1 2012-01-26 16:32:56 -08:00
Andreas Huber
4bc8bfaf11 Merge "The software AAC encoder is now an OMX component." 2012-01-26 16:00:38 -08:00
Glenn Kasten
5b0135e41b AudioStreamIn and AudioStreamOut
These are immutable, so make the fields const.
getOutput() and getInput() methods are now const.

Change-Id: I128246ebd56ea50b3e542be43f2aa1bcb55f1373
2012-01-26 15:58:07 -08:00
Roman Nurik
bb9bffb6b9 docs: add NOTICE to action bar icon pack and sprinkle download links
Change-Id: I1437ce64908c28621e86fff54767ddbd2b1fcb3a
2012-01-26 15:57:34 -08:00
Chet Haase
23fb7dc7c7 Merge "Fix old issue with compatibility-scaled apps and Animations" 2012-01-26 15:53:03 -08:00
Daniel Sandler
bbbf6b9c49 am 70828a1d: am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '70828a1d40c9bf0e5066166216013093298de034':
  Suppress mobile-out-of-service label if wifi connected.
2012-01-26 15:47:06 -08:00
Andreas Huber
afe02df45e The software AAC encoder is now an OMX component.
Yay.

Change-Id: I74938a20b4e0a622836ea5184d3761180eb0f5de
2012-01-26 15:45:38 -08:00
Glenn Kasten
efd511a925 Cleanup thread types
Use type_t instead of int for thread types.
Initialize ThreadBase::mType in constructor and make it const.

Change-Id: I43d141388b9639e4783c30b97dbda5688bf7555f
2012-01-26 15:45:12 -08:00
Roman Nurik
9d9c718925 am 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
* commit '00b3ceb48b5e23daa8101db6080bee46d6518f43':
  docs: Update designing-navigation training class to link to Android Design
2012-01-26 15:35:46 -08:00
Roman Nurik
00b3ceb48b Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1 2012-01-26 15:33:57 -08:00
Geremy Condra
838a0e0ed8 Merge "Removed intent logging from SearchDialog.java" 2012-01-26 15:06:18 -08:00
Glenn Kasten
0ae4d97689 Declare methods in binder opcode order
This makes it easier to compare interface and implementation.

Change-Id: Ie060e43dec348902abcf40f5a610cec639d6d0d3
2012-01-26 14:34:30 -08:00
Jim Miller
fb9e364380 Merge "Fix 5620754: don't show pattern unlock after SIM unlock if not enabled." 2012-01-26 14:30:49 -08:00