46817 Commits

Author SHA1 Message Date
Jeff Brown
b23bdf518b Eliminate some accidental log spam. (DO NOT MERGE)
Used #ifdef where I should have used #if.

Change-Id: Ie3a083d601c89f4fc4d83244bb5060a202574dc2
2011-03-08 16:35:07 -08:00
Amith Yamasani
1f111f1172 Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1 2011-03-08 16:34:11 -08:00
Eric Laurent
421ddc014b Fix issue 3439872: video chat and bluetooth SCO
This change fixes the stability problems experienced when using
a bluetooth headset supporting both A2DP and SCO. Problems occur
when starting the video chat at which time the A2DP output is being
stopped to start SCO. At that time, active AudioTracks are invalidated
by AudioFlinger so that a new AudioTrack binder interface can be
recreated by the client process on the new mixer thread with correct parameters.
The problem was that the process to restore the binder interface was not
protected against concurrent requests which caused 2 binder interfaces
to be created sometimes. This could lead to permanent client deadlock
if one of the client threads was waiting for a condition of the first
created binder interface while the second one was created (as the AudioFlinger
would only signal conditions on the last one created).
This concurrent request situation is more likely to happen when a client
uses the JAVA AudioTrack as the JNI implementation uses simultaneously the
native AudioTrack callback and write push mechanisms. By doing so, the code
that checks if the binder interface should be restored (in obtainBuffer()) is
much more likely to be called concurrently from two different threads.

The fix consists in protecting the critical binder interface restore phase
with a flag in the AudioTrack control block. The first thread acting upon the binder
interface restore request will raise the flag and the second thread will just wait for
a condition to be signaled when the restore process is complete.

Also protected all accesses to the AudioTrack control block by a mutex to prevent
access while the track is being destroyed and restored. If a mutex cannot be held
(e.g because we call a callback function), acquire a strong reference on the IAudioTrack
to prevent its destruction while the cblk is being accessed.

Modified AudioTrack JNI to use GetByteArrayElements() instead of
GetPrimitiveArrayCritical() when writing audio buffers. Entering a critical section would
cause the JNI to abort if a mediaserver crash occurs during a write due to the AudioSystem
callback being called during the critical section when media server process restarts.
Anyway with current JNI implementation, either versions do not copy data most of the times
and the criticial version does not guaranty no data copy.

The same modifications have been made to AudioRecord.

Change-Id: Idc5aa711a04c3eee180cdd03f44fe17f3c4dcb52
2011-03-08 16:33:15 -08:00
Amith Yamasani
79f7430bf9 Searchview layout cleanup. Some more tweaks required for Market.
Bug: 3321263

Submit area should be visible when the field has focus, irrespective of text content.
Make sure that the fields get highlighted when focused.
Also fix an issue with hint not being applied from the SearchableInfo.
Bug: 3470348

Change-Id: If399d9551f89312c19485e249043f5823a862499
2011-03-08 16:08:49 -08:00
Adam Powell
ae9d2640f3 Bug 3509417 - Refine touch event serialization
Fix an issue with single-touch events handled by webkit.

Change-Id: Ief4e9ec91cda7dd3940241c684d0907cb8c9890f
2011-03-08 16:01:37 -08:00
Jim Miller
88d2d0390d am 3de6a9b6: Merge "Fix 4025684: Don\'t include wallpaper dimensions in bounds calculation" into honeycomb-mr1
* commit '3de6a9b692437d5ce14d672cad4eff4c7ed0ae23':
  Fix 4025684: Don't include wallpaper dimensions in bounds calculation
2011-03-08 15:46:22 -08:00
Dianne Hackborn
0aa403c3bd am 09a31662: Merge "Fix issue #3505861: Need to decide large/xlarge screen size limits" into honeycomb-mr1
* commit '09a31662055605e90d6e81e06437de0d92c7cf95':
  Fix issue #3505861: Need to decide large/xlarge screen size limits
2011-03-08 15:44:10 -08:00
Jim Miller
3de6a9b692 Merge "Fix 4025684: Don't include wallpaper dimensions in bounds calculation" into honeycomb-mr1 2011-03-08 15:43:16 -08:00
Dianne Hackborn
09a3166205 Merge "Fix issue #3505861: Need to decide large/xlarge screen size limits" into honeycomb-mr1 2011-03-08 15:41:24 -08:00
Justin Ho
6f7612094a am 7b27dc12: Merge "Updated text cursor assets" into honeycomb-mr1
* commit '7b27dc1201b10e40bcd9fbc73482640ccc15a6bf':
  Updated text cursor assets
2011-03-08 15:35:47 -08:00
Jim Miller
2aded18b0e Fix 4025684: Don't include wallpaper dimensions in bounds calculation
This fixes a bug where we would capture the statusbar region in
thumbnails because the wallpaper was used in the bounds calculation.

Change-Id: I572221e83c4c363afe90e59bece9a291ce694a15
2011-03-08 15:34:20 -08:00
Justin Ho
7b27dc1201 Merge "Updated text cursor assets" into honeycomb-mr1 2011-03-08 15:34:15 -08:00
Xavier Ducrohet
0ab34279a5 am f596d697: Merge "LayoutLib: fix Capabilities and getDimensionPixelSize" into honeycomb-mr1
* commit 'f596d697b69705daa7bc21485659bd704ec5d52e':
  LayoutLib: fix Capabilities and getDimensionPixelSize
2011-03-08 15:27:25 -08:00
Xavier Ducrohet
f596d697b6 Merge "LayoutLib: fix Capabilities and getDimensionPixelSize" into honeycomb-mr1 2011-03-08 15:25:08 -08:00
Justin Ho
b0ac8e7986 Updated text cursor assets
Change-Id: Ib3f7fc4f835957c07b6c3b045cb5b3131034dde3
2011-03-08 15:24:58 -08:00
Jean-Michel Trivi
382f4e6ea4 Fix bug 4064086 Use a death handler on audio focus changes from mode
Use a death handler when audio focus changes are caused by audio
 mode changes.

The bug comes from the fact that audio focus clients that use the
 audio mode for automatic focus handling didn't register a death
 handler, which was set to null. When such a client died, this
 handler was compared against the one to remove from the
 audio focus stack, which resulted in an NPE.
The fix consists in registering a valid IBinder object in the
 audio focus stack, even for clients whose focus requests originate
 from a change in audio mode, as implemented in the
 handleFocusForCalls() method.

Change-Id: Id9e1d3d10afcd99969285f6d60fc4d7dde1e4a10
2011-03-08 15:12:26 -08:00
Adam Cohen
d8bf89116b am f10615d8: Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1
* commit 'f10615d8d86f4324bf5f6b5a2eb2874cc2b5ef3d':
  Fixing inconsistency between invalidate region and draw region
2011-03-08 15:02:34 -08:00
Xavier Ducrohet
adaa12cd9e LayoutLib: fix Capabilities and getDimensionPixelSize
Commented out a Capability that is not in ADT 10.

BridgeTypedArray.getDimensionPixelSize shouldn't call
getDimension since most of the code is duplicated, and
it prevents use from properly detecting malformed attribute
values.

Change-Id: I005b17061590dc0668729af16e896fad815f1973
2011-03-08 15:00:35 -08:00
Adam Cohen
f10615d8d8 Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1 2011-03-08 14:59:51 -08:00
Andy Stadler
bdec2e565b am c9e59899: Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1
* commit 'c9e598995db68cf97dc3ed0fc527a35e2d966afd':
  Clarify rules about encryption of emulated storage.
2011-03-08 14:53:06 -08:00
Romain Guy
1e415023ee am 3d7796c1: Merge "Correctly handle opaque fading views Bug #3475554" into honeycomb-mr1
* commit '3d7796c17ffae7892d1987053c3b6698697cffa2':
  Correctly handle opaque fading views Bug #3475554
2011-03-08 14:53:01 -08:00
Jim Miller
979bd339b5 am ccdeb60c: Merge "Fix 4025690,4027061: Minor tweaks to recent applications layouts" into honeycomb-mr1
* commit 'ccdeb60cb6bfe7fec77a787e03557927fb55080c':
  Fix 4025690,4027061: Minor tweaks to recent applications layouts
2011-03-08 14:52:57 -08:00
Andy Stadler
c9e598995d Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1 2011-03-08 14:50:32 -08:00
Romain Guy
3d7796c17f Merge "Correctly handle opaque fading views Bug #3475554" into honeycomb-mr1 2011-03-08 14:49:54 -08:00
Jim Miller
ccdeb60cb6 Merge "Fix 4025690,4027061: Minor tweaks to recent applications layouts" into honeycomb-mr1 2011-03-08 14:49:47 -08:00
Huahui Wu
f7a3169fd8 am 8496ddc5: Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1
* commit '8496ddc536eb917c813b7928f174c828d2275ada':
  b/3307761 Tuning two fingers pan.
2011-03-08 14:44:39 -08:00
Huahui Wu
8496ddc536 Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1 2011-03-08 14:40:50 -08:00
Shimeng (Simon) Wang
633c3775a9 Consider mInitialScale when setting min zoom scale.
This fixes CTS test failure.

issue: 4056256
Change-Id: Iee4adba2e462f5e0e79cf359e5b6a1531eafcdd8
2011-03-08 14:30:38 -08:00
Adam Cohen
321aa2b025 Fixing inconsistency between invalidate region and draw region
Change-Id: I84458b31b4d3e8c305d64eb25e352fc4aba933d0
2011-03-08 14:13:29 -08:00
Wink Saville
fee95518a4 Merge "Add outputting "on" or "off" setRadioPower." 2011-03-08 13:46:18 -08:00
Huahui Wu
463cc0c5e2 b/3307761 Tuning two fingers pan.
User reports jumpy when trying two fingers pan. This change keeps
track of the previous movements of the fingers' middle point,
compares to the change of the fingers' distance, and decides
to pan or zoom or do both.

Change-Id: I8a6a8e9259db85b0e820b6e25ba0822ed289fb45
2011-03-08 13:37:19 -08:00
Nicolas Roard
3cb5ded990 Partial invalidation of the browser textures
corresponding webkit CL: https://android-git.corp.google.com/g/#change,100673

bug:3461349 bug:3464483
Change-Id: I913b07a27129e37d8d949dd62e71d350ed119569
2011-03-08 13:34:56 -08:00
John Reck
14a7f3ab65 am c202df41: am 39184a08: Merge "In xlarge, use "tab" instead of "window"" into honeycomb-mr1
* commit 'c202df419fa1123bce25c645930f5915d2930d35':
  In xlarge, use "tab" instead of "window"
2011-03-08 12:33:06 -08:00
John Reck
c202df419f am 39184a08: Merge "In xlarge, use "tab" instead of "window"" into honeycomb-mr1
* commit '39184a08099e0b8fc799a75445ad0a7814bd48ac':
  In xlarge, use "tab" instead of "window"
2011-03-08 12:30:32 -08:00
John Reck
39184a0809 Merge "In xlarge, use "tab" instead of "window"" into honeycomb-mr1 2011-03-08 12:28:07 -08:00
Wink Saville
789f8323e8 Add outputting "on" or "off" setRadioPower.
Change-Id: I26087427c2d0feaf09b01e7eefba31962b2361f0
2011-03-08 12:27:09 -08:00
Jeff Brown
9e780d20fd Merge "Eliminate some accidental log spam." 2011-03-08 11:58:03 -08:00
Xavier Ducrohet
bf7d8eb6bc am 3a54f0c6: am c040eb20: Merge "LayoutLib: Fix dimension parsing to handle negative value." into honeycomb-mr1
* commit '3a54f0c64a709c3048bc59afcfe09afc30c31715':
  LayoutLib: Fix dimension parsing to handle negative value.
2011-03-08 11:57:31 -08:00
Xavier Ducrohet
3a54f0c64a am c040eb20: Merge "LayoutLib: Fix dimension parsing to handle negative value." into honeycomb-mr1
* commit 'c040eb20a8e8c1bef134490d71568fe2546d0f55':
  LayoutLib: Fix dimension parsing to handle negative value.
2011-03-08 11:55:00 -08:00
Xavier Ducrohet
c040eb20a8 Merge "LayoutLib: Fix dimension parsing to handle negative value." into honeycomb-mr1 2011-03-08 11:53:04 -08:00
Romain Guy
2243e555b0 Correctly handle opaque fading views
Bug #3475554

Change-Id: Ia4915ada67046486103dfc6f08e4dac8564f85dd
2011-03-08 11:46:28 -08:00
Irfan Sheriff
e6320d0b17 Merge "Handle client loss for a full connection" 2011-03-08 11:40:25 -08:00
Mathias Agopian
ddb9e9d650 am aaf2bc20: am de6a47a3: (-s ours) am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread
* commit 'aaf2bc20f51d089c3e66149cd80deab5b0e0a6af':
  Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only
2011-03-08 11:36:46 -08:00
Mathias Agopian
aaf2bc20f5 am de6a47a3: (-s ours) am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread
* commit 'de6a47a3e9d1a8cb5722b9785f5ffb9046c23918':
  Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only
2011-03-08 11:34:16 -08:00
Xavier Ducrohet
71b8ca0b13 am f420c1d7: am 687fe203: Merge "LayoutLib: Implement some missing add###() method in Path." into honeycomb-mr1
* commit 'f420c1d75a68ae9d716fe6d741af96f76dda62e0':
  LayoutLib: Implement some missing add###() method in Path.
2011-03-08 11:26:55 -08:00
Xavier Ducrohet
f420c1d75a am 687fe203: Merge "LayoutLib: Implement some missing add###() method in Path." into honeycomb-mr1
* commit '687fe2038780aa52bc370a903b08305de4d85647':
  LayoutLib: Implement some missing add###() method in Path.
2011-03-08 11:24:33 -08:00
Xavier Ducrohet
687fe20387 Merge "LayoutLib: Implement some missing add###() method in Path." into honeycomb-mr1 2011-03-08 11:22:46 -08:00
Wink Saville
601a7c72b4 Merge "Telephony: Fix config to reflect the correct CM conn type." 2011-03-08 11:02:54 -08:00
John Reck
9af6c1ce57 In xlarge, use "tab" instead of "window"
Bug: 4027268
 Use "tab" instead of "window" in incognito welcome page in
 xlarge.

Change-Id: I7582b845d5848db742a2884e65161ca7c00d1fd8
2011-03-08 11:01:58 -08:00
Dianne Hackborn
cc1d9f7942 Fix issue #3505861: Need to decide large/xlarge screen size limits
Decided.

Change-Id: I8292d65e3d47755778fdf85207c49f160c756452
2011-03-08 10:33:55 -08:00