78235 Commits

Author SHA1 Message Date
Wei Huang
ea2acd48dc am 58296baa: Merge "Fix startFaceDetection will fail after taking a picture." into jb-dev
* commit '58296baa78b56401874ec719727243e9c0b0266e':
  Fix startFaceDetection will fail after taking a picture.
2012-05-30 09:47:39 -07:00
Wei Huang
58296baa78 Merge "Fix startFaceDetection will fail after taking a picture." into jb-dev 2012-05-30 09:43:20 -07:00
Jim Miller
9ca07d048f am d8c5f10c: Merge "Fix 6398209: SearchPanel gesture improvements" into jb-dev
* commit 'd8c5f10c10ea1a8708481eac52ee573d5c3b6a67':
  Fix 6398209: SearchPanel gesture improvements
2012-05-30 09:29:37 -07:00
Jim Miller
d8c5f10c10 Merge "Fix 6398209: SearchPanel gesture improvements" into jb-dev 2012-05-30 09:26:37 -07:00
George Mount
acd796b1a6 am 20c15a42: Merge "Fix monkey NPE in AutoCompletePopup" into jb-dev
* commit '20c15a4271ea3a7fb2210430bfc53f611603cf76':
  Fix monkey NPE in AutoCompletePopup
2012-05-30 07:38:33 -07:00
George Mount
20c15a4271 Merge "Fix monkey NPE in AutoCompletePopup" into jb-dev 2012-05-30 07:36:11 -07:00
Satoshi Kataoka
3022b6b9cd am 17150cf9: Fix locale in TextServicesManagerService
* commit '17150cf91be1478e367c2ef5e4f5baaa66b487d0':
  Fix locale in TextServicesManagerService
2012-05-30 04:48:21 -07:00
Satoshi Kataoka
17150cf91b Fix locale in TextServicesManagerService
Bug: 6542210
Change-Id: I1670fac014beb834ec7c065ebf040d0ff3cf4161
2012-05-30 20:36:52 +09:00
Jim Miller
9a720f5eb6 Fix 6398209: SearchPanel gesture improvements
This fixes a few recent regressions caused by other bug fixes:
- add new flags to animateCollapse() so we can selectively close panels. Fixes regression caused by attempt to close recent apps from startAssistActivity() which had the side effect of closing the search panel before the animation completes.
- adds tuneable holdoff delay for responding to home key press.
- minor tweaks to MultiWaveView animations.

Change-Id: Ia48434b8d59e7b0290a5e9783960c2f684068218
2012-05-30 03:36:20 -07:00
Mathias Agopian
7e310414e4 am 38616ccc: Merge "Fix a stack corruption in sensorservice" into jb-dev
* commit '38616ccc94b1e1a605ab43cc5c230d6acc729a15':
  Fix a stack corruption in sensorservice
2012-05-29 21:09:05 -07:00
Mathias Agopian
38616ccc94 Merge "Fix a stack corruption in sensorservice" into jb-dev 2012-05-29 21:04:39 -07:00
Mathias Agopian
8fd03f4ea4 Fix a stack corruption in sensorservice
Bug: 6576732
Change-Id: If0f2fb0d0c35b932fb77cd262e676042145b28f9
2012-05-29 19:46:14 -07:00
James Dong
affa374bae am fb910e8f: Merge "Fixed a buffer overflow issue" into jb-dev
* commit 'fb910e8ffa439bc32234cfbf85c36f1f8c3a9c59':
  Fixed a buffer overflow issue
2012-05-29 18:24:32 -07:00
James Dong
fb910e8ffa Merge "Fixed a buffer overflow issue" into jb-dev 2012-05-29 18:21:38 -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
Jean Chalard
887568c4f4 am 01bf82f2: Merge "Add/refine comments to reflect key event policies" into jb-dev
* commit '01bf82f27297536399f7dcde214d1a082e3613ef':
  Add/refine comments to reflect key event policies
2012-05-29 18:06:28 -07:00
Jean Chalard
01bf82f272 Merge "Add/refine comments to reflect key event policies" into jb-dev 2012-05-29 18:02:29 -07:00
Svetoslav Ganov
378aa011d5 am a5c896af: Merge "Updating the behaviour of accessibility text iterators." into jb-dev
* commit 'a5c896afe89aaf40166343232d85980b94974032':
  Updating the behaviour of accessibility text iterators.
2012-05-29 17:32:39 -07:00
Svetoslav Ganov
a5c896afe8 Merge "Updating the behaviour of accessibility text iterators." into jb-dev 2012-05-29 17:30:16 -07:00
Svetoslav Ganov
b554ee3585 am 48d1daca: Merge "Accessiblity scroll event firing callback not properly reset." into jb-dev
* commit '48d1daca98703a470f04b4e217d9e6dae6d61dd2':
  Accessiblity scroll event firing callback not properly reset.
2012-05-29 17:10:12 -07:00
Svetoslav Ganov
48d1daca98 Merge "Accessiblity scroll event firing callback not properly reset." into jb-dev 2012-05-29 17:05:40 -07:00
Svetoslav Ganov
4a812aeb8b Accessiblity scroll event firing callback not properly reset.
1. We use a delayed callback to throttle the amount of accessibility
   scroll events fired by the view tree. The callback to do so was
   not properly reset when removed putting the view tree in a bad
   state resulting in no scroll events being fired at all.

bug:6549005

Change-Id: Ibf72d7e009e4545a336c9471f46015910290703e
2012-05-29 16:46:15 -07:00
John Reck
4a53b51955 am 2cd50c9d: Merge "Don\'t long press if preventDefault is called" into jb-dev
* commit '2cd50c9d556de341217044f40be001050a15a741':
  Don't long press if preventDefault is called
2012-05-29 16:26:12 -07:00
John Reck
2cd50c9d55 Merge "Don't long press if preventDefault is called" into jb-dev 2012-05-29 16:23:10 -07:00
John Reck
2dc3ffd31a Don't long press if preventDefault is called
Bug: 6554060

Change-Id: Iad263c78a0e1504dd10e9ef5b92505bca6991cbc
2012-05-29 16:02:23 -07:00
Christopher Tate
03ab4eb550 am aefe4aa4: Merge "Prevent construction/use of invalid restore session proxies" into jb-dev
* commit 'aefe4aa4d470d308f17a71b16bf1a0d58c79c05c':
  Prevent construction/use of invalid restore session proxies
2012-05-29 15:57:34 -07:00
Dianne Hackborn
f3b4c93e0d am ae5811c7: Merge "Fix (mostly) issue #5109947: Race condition between retrieving a..." into jb-dev
* commit 'ae5811c71405878b09eace395ec2b28e54eeb427':
  Fix (mostly) issue #5109947: Race condition between retrieving a...
2012-05-29 15:53:38 -07:00
Christopher Tate
aefe4aa4d4 Merge "Prevent construction/use of invalid restore session proxies" into jb-dev 2012-05-29 15:52:24 -07:00
Dianne Hackborn
ae5811c714 Merge "Fix (mostly) issue #5109947: Race condition between retrieving a..." into jb-dev 2012-05-29 15:51:24 -07:00
Svetoslav Ganov
09dfd60bc3 am bb1b7cf6: Merge "Adding accessibility focusable attribute (hidden for now)." into jb-dev
* commit 'bb1b7cf66bc17165b656c2aaed8027f9e5992306':
  Adding accessibility focusable attribute (hidden for now).
2012-05-29 15:48:23 -07:00
Svetoslav Ganov
bb1b7cf66b Merge "Adding accessibility focusable attribute (hidden for now)." into jb-dev 2012-05-29 15:46:15 -07:00
George Mount
7a2cb35513 Fix monkey NPE in AutoCompletePopup
Bug 6554866

Change-Id: I2942e55d98bc768f5c5c563240c1841c7e869b3c
2012-05-29 15:39:50 -07:00
Nick Pelly
96e4ae6c9f am 82b3b1bc: Merge "Make location providers upgradeable." into jb-dev
* commit '82b3b1bce9665a68b32ab0d7393ea63425677f70':
  Make location providers upgradeable.
2012-05-29 15:30:01 -07:00
Nick Pelly
82b3b1bce9 Merge "Make location providers upgradeable." into jb-dev 2012-05-29 15:28:00 -07:00
Svetoslav Ganov
f9817f7a3b Adding accessibility focusable attribute (hidden for now).
1. This attribute specifies whether a view can take accessibility
   focus. It has three values: 1) auto - the system determines
   based on whether the view is actionable and has actionable
   predecessor. Accessibility services can put accessibility focus
   on such a node at will; 2) yes ; this view always takes access
   focus; 3) no - the view cannot takes accessibility focus and
   accessibility services cannot put accessibility focus on it.

Change-Id: I2ebf4e7c75bf6b39e1742b6868b37ccdd4cc7d28
2012-05-29 15:24:22 -07:00
Svetoslav Ganov
39f2aee640 Updating the behaviour of accessibility text iterators.
1. Iterators were skipping content on reversing direction.

2. The cursor was positioned at the beginning of the next text segment
   when moving forward and at end of the previous text segment when moving
   backwards. This is incorrect and now the cursor is positioned at the
   end of the segment when moving forward and at the beginning when moving
   backward.

3. The cursor position was not properly set when reaching the end/start
   of the text.

4. The iterators were reporting strictly the next/previous segment even
   if the cursor is within such a segment. Thus, when traversing some
   content may be skipped. Now moving forward moves the selection to
   the next segment end and the start position is either the old index
   if it was within a segment or the start of the segment. Same in
   reverse.

bug:6575099

Change-Id: Ib48a649cec53910339baf831a75e26440be6e576
2012-05-29 15:16:19 -07:00
Eric Fischer
25bdda56fe am 817a243c: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '817a243c3be0920cfc0707c260e51c746bd26e01':
  Import translations. DO NOT MERGE
2012-05-29 14:31:28 -07:00
Eric Fischer
817a243c3b Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-29 14:28:56 -07:00
Jean-Baptiste Queru
4e4d259611 am 9672a381: (-s ours) am 84bda3e3: Merge "Input: Fix some Applications ANR issue in monkey test"
* commit '9672a381d00e463e4bdaf072adaf1cb6657bdbd7':
  Input: Fix some Applications ANR issue in monkey test
2012-05-29 14:18:22 -07:00
Jean-Baptiste Queru
f53da9f35e am b16f107d: (-s ours) am b8e0fd45: Merge "Lid switch state is incorrect"
* commit 'b16f107d19bd0189f2d6d4be55d5decf609ebbc0':
  Lid switch state is incorrect
2012-05-29 14:15:08 -07:00
Jake Hamby
23ad2f995e am 9d820ecc: Merge "Allow apps with SEND_SMS_NO_CONFIRMATION to bypass short code check." into jb-dev
* commit '9d820eccfc2ddbdc03680e22b9d4c4cac66a97b9':
  Allow apps with SEND_SMS_NO_CONFIRMATION to bypass short code check.
2012-05-29 13:58:50 -07:00
Craig Mautner
d1b1bef463 am de1ddd0f: Merge "Better handle changing app transitions." into jb-dev
* commit 'de1ddd0f93fae6ba517d516993e7fb495424f574':
  Better handle changing app transitions.
2012-05-29 13:55:23 -07:00
Jake Hamby
9d820eccfc Merge "Allow apps with SEND_SMS_NO_CONFIRMATION to bypass short code check." into jb-dev 2012-05-29 13:54:19 -07:00
Craig Mautner
de1ddd0f93 Merge "Better handle changing app transitions." into jb-dev 2012-05-29 13:53:06 -07:00
Jean-Baptiste Queru
9672a381d0 am 84bda3e3: Merge "Input: Fix some Applications ANR issue in monkey test"
* commit '84bda3e3c64611941c4d10b3d22e11bd623ff640':
  Input: Fix some Applications ANR issue in monkey test
2012-05-29 13:44:29 -07:00
Jean-Baptiste Queru
b16f107d19 am b8e0fd45: Merge "Lid switch state is incorrect"
* commit 'b8e0fd45b06b1537c045079a215fb66b13f34b25':
  Lid switch state is incorrect
2012-05-29 13:44:26 -07:00
Dianne Hackborn
6ae8d18218 Fix (mostly) issue #5109947: Race condition between retrieving a...
...content provider and updating its oom adj

This introduces the concept of an "unstable" reference on a content
provider.  When holding such a reference (and no normal stable ref),
the content provider dying will not cause the client process to be
killed.

This is used in ContentResolver.query(), .openAssetFileDescriptor(),
and .openTypedAssetFileDescriptor() to first access the provider
with an unstable reference, and if at the point of calling into the
provider we find it is dead then acquiring a new stable reference
and doing the operation again.  Thus if the provider process dies
at any point until we get the result back, our own process will not
be killed and we can safely retry the operation.

Arguably there is still the potential for a race -- if somehow the
provider is killed way late by the OOM killer after the query or
open has returned -- but this should now be *extremely* unlikely.
We also continue to have the issue with the other calls, but these
are much less critical, and the same model can't be used there (we
wouldn't want to execute two insert operations for example).

The implementation of this required some significant changes to the
underlying plumbing of content providers, now keeping track of the
two different reference counts, and managing them appropriately.  To
facilitate this, the activity manager now has a formal connection
object for a client reference on a content provider, which hands to
the application when opening the provider.

These changes have allowed a lot of the code to be cleaned up and
subtle issues closed.  For example, when a process is crashing, we
now have a much better idea of the state of content provider clients
(olding a stable ref, unstable ref, or waiting for it to launch), so
that we can correctly handle each of these.

The client side code is also a fair amount cleaner, though in the
future there is more than should be done.  In particular, the two
ProviderClientRecord and ProviderRefCount classes should be combined
into one, part of which is exposed to the ContentResolver internal
API as a reference on a content provider with methods for updating
reference counts and such.  Some day we'll do that.

Change-Id: I87b10d1b67573ab899e09ca428f1b556fd669c8c
2012-05-29 13:33:09 -07:00
Jim Miller
4abf86ed20 am a073e570: Fix 6398209: General animation improvements for swipe to search
* commit 'a073e570789e5b49e8339af44516444b13db4428':
  Fix 6398209: General animation improvements for swipe to search
2012-05-29 13:16:22 -07:00
Jean-Baptiste Queru
84bda3e3c6 Merge "Input: Fix some Applications ANR issue in monkey test" 2012-05-29 13:05:35 -07:00
Jean-Baptiste Queru
b8e0fd45b0 Merge "Lid switch state is incorrect" 2012-05-29 13:04:58 -07:00