OSDN Git Service
Eric Fischer [Wed, 30 May 2012 19:17:47 +0000 (12:17 -0700)]
am
dda62f69: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
dda62f69f3ebf898c2678f61eacd0371cedc025b':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 30 May 2012 19:14:48 +0000 (12:14 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Wed, 30 May 2012 18:59:21 +0000 (11:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie7124462acaa16457804e3f9f2ee13cb4b792ceb
Fred Quintana [Wed, 30 May 2012 18:39:04 +0000 (11:39 -0700)]
am
3c144c3e: Merge "Add an updateAppPermission() API call to the AccountManagerService AIDL and have the GrantCredentialsPermissionActivity call that instead of a static so that it can be made to run in a different process than the AccountManagerService. Protect this
* commit '
3c144c3e69405000f5c7542f20890437a4fb4987':
Add an updateAppPermission() API call to the AccountManagerService AIDL and have the GrantCredentialsPermissionActivity call that instead of a static so that it can be made to run in a different process than the AccountManagerService. Protect this call by checking that the caller has the same UID as the system process.
Fred Quintana [Wed, 30 May 2012 18:36:15 +0000 (11:36 -0700)]
Merge "Add an updateAppPermission() API call to the AccountManagerService AIDL and have the GrantCredentialsPermissionActivity call that instead of a static so that it can be made to run in a different process than the AccountManagerService. Protect this call by checking that the caller has the same UID as the system process." into jb-dev
Dianne Hackborn [Wed, 30 May 2012 18:20:51 +0000 (11:20 -0700)]
am
f46bd06c: Merge "Fix issue #
6579824: Email crash observed after updating..." into jb-dev
* commit '
f46bd06c6822752acd24265a7db5c86d6036bc38':
Fix issue #
6579824: Email crash observed after updating...
Dianne Hackborn [Wed, 30 May 2012 18:20:48 +0000 (11:20 -0700)]
am
26627ccc: Merge "A little debug code from issue #
6516197: Places app not getting removed..." into jb-dev
* commit '
26627ccc3f20ad353cf7c48c0488699c26e69a0b':
A little debug code from issue #
6516197: Places app not getting removed...
Dianne Hackborn [Wed, 30 May 2012 18:18:33 +0000 (11:18 -0700)]
Merge "Fix issue #
6579824: Email crash observed after updating..." into jb-dev
Dianne Hackborn [Wed, 30 May 2012 18:18:08 +0000 (11:18 -0700)]
Merge "A little debug code from issue #
6516197: Places app not getting removed..." into jb-dev
Dianne Hackborn [Wed, 30 May 2012 18:06:31 +0000 (11:06 -0700)]
Fix issue #
6579824: Email crash observed after updating...
...device from JRN59D to JRN60
Deal correctly with multiprocess content providers that need to
be loaded into a secondary process; wasn't correctly detecting the
case where the IContentProvider returned by the activity manager
is null. (installProvider used to be given the direct IContentProvider,
now it gets the ContentProviderHolder and much check whether the
provider inside is null.)
Change-Id: I888622e275a459031ab849952941f39cf9c02ee0
Jim Miller [Wed, 30 May 2012 17:56:04 +0000 (10:56 -0700)]
am
a78bdd95: Merge "Fix
6578735: don\'t crash system ui when there\'s no search activity" into jb-dev
* commit '
a78bdd95b30ecdbd26e1b46c0d651b3975fea6b8':
Fix
6578735: don't crash system ui when there's no search activity
Jim Miller [Wed, 30 May 2012 17:53:15 +0000 (10:53 -0700)]
Merge "Fix
6578735: don't crash system ui when there's no search activity" into jb-dev
Alice Yang [Wed, 30 May 2012 17:42:26 +0000 (10:42 -0700)]
am
6c66e984: Merge "New UI for account picker" into jb-dev
* commit '
6c66e9842e93874bfd6d8c3dbcd19e7dae379877':
New UI for account picker
Alice Yang [Wed, 30 May 2012 17:39:42 +0000 (10:39 -0700)]
Merge "New UI for account picker" into jb-dev
The Android Open Source Project [Wed, 30 May 2012 17:13:16 +0000 (10:13 -0700)]
Reconcile with jb-release
Change-Id: Ia2514057835ea934bdf82d79d77e975b0ecdf45f
Philip Milne [Wed, 30 May 2012 17:01:19 +0000 (10:01 -0700)]
am
5ab6e12b: Merge "Fix
6538388: Home buttons do not respect the no "vibrate on touch" option." into jb-dev
* commit '
5ab6e12b450d13c8eb501001c7a8669826b86ea4':
Fix
6538388: Home buttons do not respect the no "vibrate on touch" option.
Philip Milne [Wed, 30 May 2012 16:58:47 +0000 (09:58 -0700)]
Merge "Fix
6538388: Home buttons do not respect the no "vibrate on touch" option." into jb-dev
Jim Miller [Wed, 30 May 2012 16:50:00 +0000 (09:50 -0700)]
Fix
6578735: don't crash system ui when there's no search activity
Because SearchPanelView tracks input even when it's not showing, it
was possible to trigger search with a gesture.
Change-Id: I60f654d279d2ff1799d8a4b69796da8c7e81f3c7
Wei Huang [Wed, 30 May 2012 16:47:39 +0000 (09:47 -0700)]
am
58296baa: Merge "Fix startFaceDetection will fail after taking a picture." into jb-dev
* commit '
58296baa78b56401874ec719727243e9c0b0266e':
Fix startFaceDetection will fail after taking a picture.
Wei Huang [Wed, 30 May 2012 16:43:20 +0000 (09:43 -0700)]
Merge "Fix startFaceDetection will fail after taking a picture." into jb-dev
Jim Miller [Wed, 30 May 2012 16:29:37 +0000 (09:29 -0700)]
am
d8c5f10c: Merge "Fix
6398209: SearchPanel gesture improvements" into jb-dev
* commit '
d8c5f10c10ea1a8708481eac52ee573d5c3b6a67':
Fix
6398209: SearchPanel gesture improvements
Jim Miller [Wed, 30 May 2012 16:26:37 +0000 (09:26 -0700)]
Merge "Fix
6398209: SearchPanel gesture improvements" into jb-dev
George Mount [Wed, 30 May 2012 14:38:33 +0000 (07:38 -0700)]
am
20c15a42: Merge "Fix monkey NPE in AutoCompletePopup" into jb-dev
* commit '
20c15a4271ea3a7fb2210430bfc53f611603cf76':
Fix monkey NPE in AutoCompletePopup
George Mount [Wed, 30 May 2012 14:36:11 +0000 (07:36 -0700)]
Merge "Fix monkey NPE in AutoCompletePopup" into jb-dev
The Android Automerger [Wed, 30 May 2012 14:03:03 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Satoshi Kataoka [Wed, 30 May 2012 11:48:21 +0000 (04:48 -0700)]
am
17150cf9: Fix locale in TextServicesManagerService
* commit '
17150cf91be1478e367c2ef5e4f5baaa66b487d0':
Fix locale in TextServicesManagerService
Satoshi Kataoka [Wed, 30 May 2012 11:05:44 +0000 (20:05 +0900)]
Fix locale in TextServicesManagerService
Bug:
6542210
Change-Id: I1670fac014beb834ec7c065ebf040d0ff3cf4161
Jim Miller [Wed, 30 May 2012 10:19:43 +0000 (03:19 -0700)]
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
Mathias Agopian [Wed, 30 May 2012 04:09:05 +0000 (21:09 -0700)]
am
38616ccc: Merge "Fix a stack corruption in sensorservice" into jb-dev
* commit '
38616ccc94b1e1a605ab43cc5c230d6acc729a15':
Fix a stack corruption in sensorservice
Mathias Agopian [Wed, 30 May 2012 04:04:39 +0000 (21:04 -0700)]
Merge "Fix a stack corruption in sensorservice" into jb-dev
Svetoslav Ganov [Tue, 29 May 2012 23:46:10 +0000 (16:46 -0700)]
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
Mathias Agopian [Wed, 30 May 2012 02:46:14 +0000 (19:46 -0700)]
Fix a stack corruption in sensorservice
Bug:
6576732
Change-Id: If0f2fb0d0c35b932fb77cd262e676042145b28f9
Dianne Hackborn [Wed, 30 May 2012 01:46:45 +0000 (18:46 -0700)]
A little debug code from issue #
6516197: Places app not getting removed...
...from recent apps drawer after launching Places app
Change-Id: Ibfa75e9cea2721a7380d7c13dc21504fbce61aee
James Dong [Wed, 30 May 2012 01:24:32 +0000 (18:24 -0700)]
am
fb910e8f: Merge "Fixed a buffer overflow issue" into jb-dev
* commit '
fb910e8ffa439bc32234cfbf85c36f1f8c3a9c59':
Fixed a buffer overflow issue
James Dong [Wed, 30 May 2012 01:21:38 +0000 (18:21 -0700)]
Merge "Fixed a buffer overflow issue" into jb-dev
James Dong [Wed, 30 May 2012 01:05:57 +0000 (18:05 -0700)]
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
Jean Chalard [Wed, 30 May 2012 01:06:28 +0000 (18:06 -0700)]
am
01bf82f2: Merge "Add/refine comments to reflect key event policies" into jb-dev
* commit '
01bf82f27297536399f7dcde214d1a082e3613ef':
Add/refine comments to reflect key event policies
Jean Chalard [Wed, 30 May 2012 01:02:29 +0000 (18:02 -0700)]
Merge "Add/refine comments to reflect key event policies" into jb-dev
Svetoslav Ganov [Wed, 30 May 2012 00:32:39 +0000 (17:32 -0700)]
am
a5c896af: Merge "Updating the behaviour of accessibility text iterators." into jb-dev
* commit '
a5c896afe89aaf40166343232d85980b94974032':
Updating the behaviour of accessibility text iterators.
Svetoslav Ganov [Wed, 30 May 2012 00:30:16 +0000 (17:30 -0700)]
Merge "Updating the behaviour of accessibility text iterators." into jb-dev
Svetoslav Ganov [Wed, 30 May 2012 00:10:12 +0000 (17:10 -0700)]
am
48d1daca: Merge "Accessiblity scroll event firing callback not properly reset." into jb-dev
* commit '
48d1daca98703a470f04b4e217d9e6dae6d61dd2':
Accessiblity scroll event firing callback not properly reset.
Svetoslav Ganov [Wed, 30 May 2012 00:05:40 +0000 (17:05 -0700)]
Merge "Accessiblity scroll event firing callback not properly reset." into jb-dev
Svetoslav Ganov [Tue, 29 May 2012 23:46:10 +0000 (16:46 -0700)]
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
Philip Milne [Tue, 29 May 2012 21:46:54 +0000 (14:46 -0700)]
Fix
6538388: Home buttons do not respect the no "vibrate on touch" option.
Change-Id: I1792caf4c0501055329611f4c5e237815463d43d
John Reck [Tue, 29 May 2012 23:26:12 +0000 (16:26 -0700)]
am
2cd50c9d: Merge "Don\'t long press if preventDefault is called" into jb-dev
* commit '
2cd50c9d556de341217044f40be001050a15a741':
Don't long press if preventDefault is called
John Reck [Tue, 29 May 2012 23:23:10 +0000 (16:23 -0700)]
Merge "Don't long press if preventDefault is called" into jb-dev
John Reck [Tue, 29 May 2012 23:02:23 +0000 (16:02 -0700)]
Don't long press if preventDefault is called
Bug:
6554060
Change-Id: Iad263c78a0e1504dd10e9ef5b92505bca6991cbc
Christopher Tate [Tue, 29 May 2012 22:57:34 +0000 (15:57 -0700)]
am
aefe4aa4: Merge "Prevent construction/use of invalid restore session proxies" into jb-dev
* commit '
aefe4aa4d470d308f17a71b16bf1a0d58c79c05c':
Prevent construction/use of invalid restore session proxies
Dianne Hackborn [Tue, 29 May 2012 22:53:38 +0000 (15:53 -0700)]
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...
Christopher Tate [Tue, 29 May 2012 22:52:24 +0000 (15:52 -0700)]
Merge "Prevent construction/use of invalid restore session proxies" into jb-dev
Dianne Hackborn [Tue, 29 May 2012 22:51:24 +0000 (15:51 -0700)]
Merge "Fix (mostly) issue #
5109947: Race condition between retrieving a..." into jb-dev
Svetoslav Ganov [Tue, 29 May 2012 22:48:23 +0000 (15:48 -0700)]
am
bb1b7cf6: Merge "Adding accessibility focusable attribute (hidden for now)." into jb-dev
* commit '
bb1b7cf66bc17165b656c2aaed8027f9e5992306':
Adding accessibility focusable attribute (hidden for now).
Svetoslav Ganov [Tue, 29 May 2012 22:46:15 +0000 (15:46 -0700)]
Merge "Adding accessibility focusable attribute (hidden for now)." into jb-dev
George Mount [Tue, 29 May 2012 22:39:50 +0000 (15:39 -0700)]
Fix monkey NPE in AutoCompletePopup
Bug
6554866
Change-Id: I2942e55d98bc768f5c5c563240c1841c7e869b3c
Nick Pelly [Tue, 29 May 2012 22:30:01 +0000 (15:30 -0700)]
am
82b3b1bc: Merge "Make location providers upgradeable." into jb-dev
* commit '
82b3b1bce9665a68b32ab0d7393ea63425677f70':
Make location providers upgradeable.
Nick Pelly [Tue, 29 May 2012 22:28:00 +0000 (15:28 -0700)]
Merge "Make location providers upgradeable." into jb-dev
Svetoslav Ganov [Wed, 23 May 2012 01:10:31 +0000 (18:10 -0700)]
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
Svetoslav Ganov [Tue, 29 May 2012 16:15:30 +0000 (09:15 -0700)]
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
Eric Fischer [Tue, 29 May 2012 21:31:28 +0000 (14:31 -0700)]
am
817a243c: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
817a243c3be0920cfc0707c260e51c746bd26e01':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 21:28:56 +0000 (14:28 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Jean-Baptiste Queru [Tue, 29 May 2012 21:18:22 +0000 (14:18 -0700)]
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
Jean-Baptiste Queru [Tue, 29 May 2012 21:15:08 +0000 (14:15 -0700)]
am
b16f107d: (-s ours) am
b8e0fd45: Merge "Lid switch state is incorrect"
* commit '
b16f107d19bd0189f2d6d4be55d5decf609ebbc0':
Lid switch state is incorrect
Jake Hamby [Tue, 29 May 2012 20:58:50 +0000 (13:58 -0700)]
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.
Craig Mautner [Tue, 29 May 2012 20:55:23 +0000 (13:55 -0700)]
am
de1ddd0f: Merge "Better handle changing app transitions." into jb-dev
* commit '
de1ddd0f93fae6ba517d516993e7fb495424f574':
Better handle changing app transitions.
Jake Hamby [Tue, 29 May 2012 20:54:19 +0000 (13:54 -0700)]
Merge "Allow apps with SEND_SMS_NO_CONFIRMATION to bypass short code check." into jb-dev
Craig Mautner [Tue, 29 May 2012 20:53:06 +0000 (13:53 -0700)]
Merge "Better handle changing app transitions." into jb-dev
Jean-Baptiste Queru [Tue, 29 May 2012 20:44:29 +0000 (13:44 -0700)]
am
84bda3e3: Merge "Input: Fix some Applications ANR issue in monkey test"
* commit '
84bda3e3c64611941c4d10b3d22e11bd623ff640':
Input: Fix some Applications ANR issue in monkey test
Jean-Baptiste Queru [Tue, 29 May 2012 20:44:26 +0000 (13:44 -0700)]
am
b8e0fd45: Merge "Lid switch state is incorrect"
* commit '
b8e0fd45b06b1537c045079a215fb66b13f34b25':
Lid switch state is incorrect
Dianne Hackborn [Wed, 23 May 2012 20:12:42 +0000 (13:12 -0700)]
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
Alice Yang [Tue, 29 May 2012 20:31:04 +0000 (13:31 -0700)]
New UI for account picker
- Added radio buttons to indicate the selected item
- "Add account" is one of the list options instead of a button
- Removed icons
- Added "Cancel" and "OK" buttons
- Use dialog theme
- Omit description text by default
Bug
6505441
Change-Id: I672a11481ee99e183142142bddf8f97b7b149d37
Jim Miller [Tue, 29 May 2012 20:16:22 +0000 (13:16 -0700)]
am
a073e570: Fix
6398209: General animation improvements for swipe to search
* commit '
a073e570789e5b49e8339af44516444b13db4428':
Fix
6398209: General animation improvements for swipe to search
Jean-Baptiste Queru [Tue, 29 May 2012 20:05:35 +0000 (13:05 -0700)]
Merge "Input: Fix some Applications ANR issue in monkey test"
Jean-Baptiste Queru [Tue, 29 May 2012 20:04:57 +0000 (13:04 -0700)]
Merge "Lid switch state is incorrect"
Craig Mautner [Sun, 27 May 2012 19:02:11 +0000 (12:02 -0700)]
Better handle changing app transitions.
When we are in the middle of an app transition and need to change to a
new one we were not ending the old one in a clean state. Also,
wallpapers were defaulting to the wrong animation in certain
situations.
Remove ':' style iterators.
Fixes bug
6486708.
Change-Id: Ied17e8410486020295db380ff68df5dad08bc5cc
Jim Miller [Thu, 24 May 2012 00:03:27 +0000 (17:03 -0700)]
Fix
6398209: General animation improvements for swipe to search
This cleans up the animation for swipe to search from the navbar. In particular:
1. Wait for initial animation to finish if gesture was too quick.
2. Better fade animation
3. Hide background and fade in when ring is selected
4. Smoother target and outer ring animation when switching between states.
Change-Id: I401197760cf9f06b6ff3e1cdb80bee86a03ef276
Eric Fischer [Tue, 29 May 2012 19:41:20 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I85d4f52df7eedc1ee7d01e2aeeb98df66b2eb292
Michael Jurka [Tue, 29 May 2012 19:29:49 +0000 (12:29 -0700)]
am
a66c75a8: Merge "Fix bug where recents was getting preloaded unnecessarily" into jb-dev
* commit '
a66c75a87e3485773430974b9bc314d010ba3542':
Fix bug where recents was getting preloaded unnecessarily
Michael Jurka [Tue, 29 May 2012 19:26:35 +0000 (12:26 -0700)]
Merge "Fix bug where recents was getting preloaded unnecessarily" into jb-dev
Winson Chung [Tue, 29 May 2012 19:20:23 +0000 (12:20 -0700)]
am
1ee0a7d4: Merge "Fixing typos related to portrait enums." into jb-dev
* commit '
1ee0a7d44a577dd19b022ff9247495f660d1ade8':
Fixing typos related to portrait enums.
Andrew Flynn [Tue, 29 May 2012 19:20:21 +0000 (12:20 -0700)]
am
15332efd: Merge "Set phone/data signal icon ids to 0 in airplane mode" into jb-dev
* commit '
15332efd2c4dd9b96368a58216e13d083638dbae':
Set phone/data signal icon ids to 0 in airplane mode
Winson Chung [Tue, 29 May 2012 19:19:10 +0000 (12:19 -0700)]
Merge "Fixing typos related to portrait enums." into jb-dev
Andrew Flynn [Tue, 29 May 2012 19:18:22 +0000 (12:18 -0700)]
Merge "Set phone/data signal icon ids to 0 in airplane mode" into jb-dev
Craig Mautner [Tue, 29 May 2012 18:48:45 +0000 (11:48 -0700)]
am
1dee8974: Merge "Track animating apps up until animation starts." into jb-dev
* commit '
1dee8974693fff55e276e0aed1202e43904bb944':
Track animating apps up until animation starts.
Craig Mautner [Tue, 29 May 2012 18:45:16 +0000 (11:45 -0700)]
Merge "Track animating apps up until animation starts." into jb-dev
Winson Chung [Tue, 29 May 2012 17:56:26 +0000 (10:56 -0700)]
Fixing typos related to portrait enums.
Change-Id: Ia2ca7aebec7c9adba093aec594429c9f01875448
Amith Yamasani [Tue, 29 May 2012 18:26:16 +0000 (11:26 -0700)]
am
3dac0226: Merge "Show power menu on tablets." into jb-dev
* commit '
3dac02265e42bf176e26b83da430ce15d6fd06df':
Show power menu on tablets.
Amith Yamasani [Tue, 29 May 2012 18:22:32 +0000 (11:22 -0700)]
Merge "Show power menu on tablets." into jb-dev
Craig Mautner [Tue, 29 May 2012 17:46:00 +0000 (10:46 -0700)]
Track animating apps up until animation starts.
ActivityStack sets the mNextAppTransition value before moving the apps
to their proper position. This makes the test for mNextAppTransition
being TRANSITION_UNSET incorrect. Better to just look for animating.
Fixes bug
6565418.
Change-Id: I4651b7d3678e46fc712a8e901992fb01b94c415e
The Android Open Source Project [Tue, 29 May 2012 16:39:33 +0000 (09:39 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I2b5e77195eae1a9676c2530a9023290936e55255
The Android Automerger [Tue, 29 May 2012 15:58:07 +0000 (08:58 -0700)]
merge in jb-release history after reset to jb-dev
Michael Jurka [Tue, 29 May 2012 15:44:31 +0000 (08:44 -0700)]
am
48c22c84: Merge "Adding debugging code for bug where recycled views still had parent" into jb-dev
* commit '
48c22c84c089213dda6495fbdeb384e400c7c5c5':
Adding debugging code for bug where recycled views still had parent
Michael Jurka [Tue, 29 May 2012 15:41:49 +0000 (08:41 -0700)]
Merge "Adding debugging code for bug where recycled views still had parent" into jb-dev
Michael Jurka [Tue, 29 May 2012 15:25:32 +0000 (08:25 -0700)]
Fix bug where recents was getting preloaded unnecessarily
Change-Id: I7d2254da009113f81fae0a785583b1c7fd6ad020
Danielle Millett [Tue, 29 May 2012 13:27:14 +0000 (06:27 -0700)]
am
45973d6d: Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev
* commit '
45973d6d19eb9329d77e62004e80f63f111a27e5':
Moved setting the flag to suppress face unlock during a phone call
Danielle Millett [Tue, 29 May 2012 13:24:05 +0000 (06:24 -0700)]
Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev
Nick Pelly [Sun, 27 May 2012 23:12:45 +0000 (16:12 -0700)]
Make location providers upgradeable.
Use config_netowrkLocationProviderPackageName and
config_geocodeProviderPackageName as intial packages. If another
package exists (or is later installed) that also implements a
provider, and has the same signatures as the original providers,
and has a hgiher version number, then use that instead.
The old code used a funky fix of package name substring checks
and service checks that was broken and not upgradeable.
Bug:
6499445
Change-Id: Ic58f09cf85d31d9abf47707093e22f31dda25cf0
Michael Jurka [Tue, 29 May 2012 10:44:18 +0000 (03:44 -0700)]
Adding debugging code for bug where recycled views still had parent
Bug:
6499508
Change-Id: Iaf95ee6a0836c5f1e863d6a5b969e032d36a2b27
Jean Chalard [Tue, 29 May 2012 10:12:34 +0000 (19:12 +0900)]
Add/refine comments to reflect key event policies
Make clearer how the platform is handling key events following some
unfortunate uses by third party applications. Also highlight the
changes in Jelly Bean default keyboard.
Bug:
6566711
Change-Id: Ibcdaf54c6d629fd0733529bfe2fffc82f555f084
Wu-cheng Li [Tue, 29 May 2012 08:47:44 +0000 (16:47 +0800)]
Fix startFaceDetection will fail after taking a picture.
bug:
6568961
Change-Id: I353c24496ec00805ed46ba90457729dfb5b2c337
Zhenghua Wang [Mon, 28 May 2012 13:49:43 +0000 (21:49 +0800)]
Input: Fix some Applications ANR issue in monkey test
Issue Description:
When do monkey test on some applications, there is big probability get ANR issue. one example is as following:
adb shell monkey -p com.google.android.street -v 500000
Root Cause:
situation 1. InputDispatcher Thread calls findTouchedWindowTargetsLocked routine, there is a AMOTION_EVENT_ACTION_DOWN event
and it can find a splittable touched window for this event , then mTouchState.split set to true.
situation 2. WMS Thread calls setInputWindows routine and all TouchedWindows associated with mTouchState are removed ,
mTouchState.split status still keep true.
situation 3. InputDispatcher Thread calls findTouchedWindowTargetsLocked routine, there is a AMOTION_EVENT_ACTION_POINTER_DOWN event
and it can find found touched window, exit window loop in following code :
if (windowInfo->visible) {
if (! (flags & InputWindowInfo::FLAG_NOT_TOUCHABLE)) {
isTouchModal = (flags & (InputWindowInfo::FLAG_NOT_FOCUSABLE
| InputWindowInfo::FLAG_NOT_TOUCH_MODAL)) == 0;
if (isTouchModal || windowInfo->touchableRegionContainsPoint(x, y)) {
if (! screenWasOff
|| (flags & InputWindowInfo::FLAG_TOUCHABLE_WHEN_WAKING)) {
newTouchedWindowHandle = windowHandle;
}
break; // found touched window, exit window loop
}
}
situation 4. The following code will have problem after situation 3 in below conditions:
newTouchedWindowHandle doesn't support split , isSplit is true ( last time touched window is splittable )
mTempTouchState.getFirstForegroundWindowHandle will always return NULL due to situation 2
// Figure out whether splitting will be allowed for this window.
if (newTouchedWindowHandle != NULL
&& newTouchedWindowHandle->getInfo()->supportsSplitTouch()) {
// New window supports splitting.
isSplit = true;
} else if (isSplit) {
// New window does not support splitting but we have already split events.
// Assign the pointer to the first foreground window we find.
// (May be NULL which is why we put this code block before the next check.)
newTouchedWindowHandle = mTempTouchState.getFirstForegroundWindowHandle();
}
The window says it does not want to support splitting, so the touches should go to one of the previously split windows except
that there are none, which result to "goto Unresponsive" in findtouchedWindowTargetsLocked routine.
This is not the correct behavior because the user did actually touch something.
situation 5. InputDispatcher Thread will call dispatchOnce repeated to try to dispatch this AMOTION_EVENT_ACTION_POINTER_DOWN event,
then ANR timeout ( 5000ms ) will be exceeded after several times "goto Unresponsive"in findtouchedWindowTargetsLocked routine.
Solution:
In situation 4 we should drop the touch. If the newly touched window was splittable then we wouldn't drop the touch.
It's only when the newly touched window was not splittable where we will drop the touch.
Change-Id: Iab2c06ce0597ac77eb886ccd9d84646c86723bdb
Author: Jeffrey Brown <jeffbrown@android.com>
Author: Erjun Ding <erjunx.ding@intel.com>
Author: Zhenghua Wang <zhenghua.wang@intel.com>
Author: Jack Ren <jack.ren@intel.com>
Author: Bruce Beare <bruce.j.beare@intel.com>