20797 Commits

Author SHA1 Message Date
Romain Guy
3391435afd am 812dba1f: Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1
* commit '812dba1fcaa1a374124c2fe0694c1b4f21e3dea9':
  Prevents NPE when a View was detached Bug #4068284
2011-03-08 23:53:06 -08:00
Romain Guy
812dba1fca Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1 2011-03-08 23:51:02 -08:00
Adam Powell
4763777ebf am 1250c94b: Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1
* commit '1250c94b50a3322e44c8ded7ab15bd6da9cc82a7':
  Bug 3509417 - Refine touch event serialization
2011-03-08 20:02:44 -08:00
Adam Powell
1250c94b50 Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1 2011-03-08 20:00:25 -08:00
Carl Shapiro
9b8c5f6143 Merge "Remove unused JNI global references." 2011-03-08 19:49:47 -08:00
Nicolas Roard
acafb26d34 am f986d496: Merge "Partial invalidation of the browser textures" into honeycomb-mr1
* commit 'f986d496c56fc8ae44b03f982e3e1ed437cdb996':
  Partial invalidation of the browser textures
2011-03-08 19:06:17 -08:00
Nicolas Roard
f986d496c5 Merge "Partial invalidation of the browser textures" into honeycomb-mr1 2011-03-08 19:02:33 -08:00
Amith Yamasani
ad8479ddcc am f9b9bd53: am 1f111f11: Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1
* commit 'f9b9bd538d846d8931eb9cc4f05d51f4d19a318d':
  Searchview layout cleanup. Some more tweaks required for Market.
2011-03-08 18:43:37 -08:00
Justin Ho
1464d1d98a am 6f761209: am 7b27dc12: Merge "Updated text cursor assets" into honeycomb-mr1
* commit '6f7612094a568b5ad477440bb865b6c673a476b2':
  Updated text cursor assets
2011-03-08 18:42:04 -08:00
Adam Cohen
00b9ea7daf am d8bf8911: am f10615d8: Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1
* commit 'd8bf89116b30a13ea48e3b057897ad83058095b1':
  Fixing inconsistency between invalidate region and draw region
2011-03-08 18:41:29 -08:00
Andy Stadler
a90ad2ced2 am bdec2e56: am c9e59899: Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1
* commit 'bdec2e565bd1f086d65a956db432bf54cdf78f6d':
  Clarify rules about encryption of emulated storage.
2011-03-08 18:41:20 -08:00
Romain Guy
cf0f9a0b62 am 1e415023: am 3d7796c1: Merge "Correctly handle opaque fading views Bug #3475554" into honeycomb-mr1
* commit '1e415023ee4c8aef2bfcb51e4293e62eb32eb23f':
  Correctly handle opaque fading views Bug #3475554
2011-03-08 18:41:15 -08:00
Huahui Wu
388b0768e1 am f7a3169f: am 8496ddc5: Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1
* commit 'f7a3169fd85db08538809d17d802795ea4e62b0c':
  b/3307761 Tuning two fingers pan.
2011-03-08 18:40:46 -08:00
Xia Wang
3d58d63b03 Add WifiStressTest to Wi-Fi only test suite.
Change-Id: Id15ec2e291729b910ee05cef4650efb8d2e1a43c
2011-03-08 18:25:31 -08:00
Mike Lockwood
3a68b8338b USB: Add API and dialog for apps to request permissions for USB devices and accessories
New APIs:

UsbManager.hasPermission returns true if the caller has permission
for the given device or accessory

UsbManager.requestPermission poses a dialog to allow the user to give the caller
permission for the device or accessory.
Result is returned via a PendingIntent.
No dialog is displayed if the caller already has permission.

Also moved UsbResolverActivity to SystemUI package

BUG: 4069037

Change-Id: I93be769501a8776b49ac26e468af19f8fa2114c9
2011-03-08 21:22:19 -05:00
Romain Guy
e294d41593 Prevents NPE when a View was detached
Bug #4068284

Change-Id: Ied1c9b8d32a3e9957c6b165642ba40bbdaf35d53
2011-03-08 17:35:10 -08:00
Amith Yamasani
f9b9bd538d am 1f111f11: Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1
* commit '1f111f11721d5d550f45135ba193c465e59a635b':
  Searchview layout cleanup. Some more tweaks required for Market.
2011-03-08 16:36:47 -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
Dianne Hackborn
7ad33c8f9e Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class
Change-Id: I1970252e07f703087ac96378410ae2b6e6e4c2d3
2011-03-08 15:53:25 -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
Justin Ho
7b27dc1201 Merge "Updated text cursor assets" into honeycomb-mr1 2011-03-08 15:34:15 -08:00
Justin Ho
b0ac8e7986 Updated text cursor assets
Change-Id: Ib3f7fc4f835957c07b6c3b045cb5b3131034dde3
2011-03-08 15:24:58 -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
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
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
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
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
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
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
Gilles Debunne
682e32b743 am 0a301f58: am 949d0c8c: Merge "Text handles positions\' are correctly updated." into honeycomb-mr1
* commit '0a301f58a2b09a3c8aa083574121d21f275f62b9':
  Text handles positions' are correctly updated.
2011-03-08 10:27:47 -08:00
Gilles Debunne
0a301f58a2 am 949d0c8c: Merge "Text handles positions\' are correctly updated." into honeycomb-mr1
* commit '949d0c8c384437d92fc1432b750da6da59df1fa7':
  Text handles positions' are correctly updated.
2011-03-08 10:24:30 -08:00
Gilles Debunne
830fbd6008 Merge "Removed unnecessary memory allocation in TextView." 2011-03-08 10:22:20 -08:00
Gilles Debunne
949d0c8c38 Merge "Text handles positions' are correctly updated." into honeycomb-mr1 2011-03-08 10:21:54 -08:00
Irfan Sheriff
c23971b3e4 Handle client loss for a full connection
Bug: 3513246
Change-Id: I928544a05702bb004457e2b0d2eeb3c34f98edf9
2011-03-08 10:18:38 -08:00
Ramesh Sudini
979f47544b Telephony: Fix config to reflect the correct CM conn type.
Reflect the correct connectivity manager connection type in the config.xml.

Change-Id: I9cb108c4543f9f765348843a02bc29c2dd58c076
2011-03-08 09:40:57 -08:00