OSDN Git Service
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
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
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
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
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>
Bryan Mawhinney [Sun, 27 May 2012 19:50:40 +0000 (12:50 -0700)]
am
c3a5cf9a: Actually set the video scaling mode :-)
* commit '
c3a5cf9aab3d409445accb2a93c09e6b4140d196':
Actually set the video scaling mode :-)
Bryan Mawhinney [Sun, 27 May 2012 16:42:46 +0000 (17:42 +0100)]
Actually set the video scaling mode :-)
Change-Id: Ia3e77b68a07651861e9be268ab77cac808b3be79
Romain Guy [Sat, 26 May 2012 02:23:48 +0000 (19:23 -0700)]
am
bbedfa00: Merge "Tale of status bar on crespo, part 3 Bug #
6541079" into jb-dev
* commit '
bbedfa0036f8de393c05b2ad981695ae74e7ab42':
Tale of status bar on crespo, part 3 Bug #
6541079
Romain Guy [Sat, 26 May 2012 02:21:49 +0000 (19:21 -0700)]
Merge "Tale of status bar on crespo, part 3 Bug #
6541079" into jb-dev
Jeff Brown [Sat, 26 May 2012 01:41:20 +0000 (18:41 -0700)]
am
d4cf7e7b: Merge "Don\'t ANR on hover, scroll or if a window goes away." into jb-dev
* commit '
d4cf7e7b06e6870d447dbed2683b8849cfe5336b':
Don't ANR on hover, scroll or if a window goes away.
Jeff Brown [Sat, 26 May 2012 01:38:24 +0000 (18:38 -0700)]
Merge "Don't ANR on hover, scroll or if a window goes away." into jb-dev
Chet Haase [Fri, 25 May 2012 22:52:01 +0000 (15:52 -0700)]
am
a27551dd: Merge "Make Google search panel go away when receiving phone call" into jb-dev
* commit '
a27551dde853733e89aa16b6fb096186b08c5d81':
Make Google search panel go away when receiving phone call
John Reck [Fri, 25 May 2012 22:51:58 +0000 (15:51 -0700)]
am
7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev
* commit '
7cbe645730286eb7e5ff7339ce8c6a2ee181f2eb':
Copy over the scroll position for the scrolling layer
Chet Haase [Fri, 25 May 2012 22:49:47 +0000 (15:49 -0700)]
Merge "Make Google search panel go away when receiving phone call" into jb-dev
John Reck [Fri, 25 May 2012 22:49:15 +0000 (15:49 -0700)]
Merge "Copy over the scroll position for the scrolling layer" into jb-dev
Amith Yamasani [Thu, 24 May 2012 20:53:26 +0000 (13:53 -0700)]
Show power menu on tablets.
Bug:
6524432
Show power menu on all devices by default. Specific devices will be disabled in overlays.
Handle airplane mode changes differently when the telephony states are not reliable.
Use simple toggle for silent mode when there's no vibrator.
Change-Id: Ic5ef521eee19cd300d909250203ff204f3a1ae1e
Jake Hamby [Fri, 25 May 2012 22:12:36 +0000 (15:12 -0700)]
Allow apps with SEND_SMS_NO_CONFIRMATION to bypass short code check.
Change SMSDispatcher to bypass SMS premium short code confirmation
dialog when caller has "android.permission.SEND_SMS_NO_CONFIRMATION"
permission (instead of checking package name against hardcoded list).
This permission is only available to system apps or those signed with
the same certificates as those in the system image.
Bug:
6502817
Change-Id: I6098d448892cc5e842ba6dc10cf494295e7226af
Irfan Sheriff [Fri, 25 May 2012 22:15:32 +0000 (15:15 -0700)]
am
e2417b7a: Merge "Retain device during connecting state" into jb-dev
* commit '
e2417b7a6ef2ba539be70574fe7c9e1af4810dd4':
Retain device during connecting state
Irfan Sheriff [Fri, 25 May 2012 22:13:27 +0000 (15:13 -0700)]
Merge "Retain device during connecting state" into jb-dev
Brandon Keely [Fri, 25 May 2012 21:41:52 +0000 (14:41 -0700)]
am
3ef8dd2b: Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev
* commit '
3ef8dd2b399109c2c9b05ea24315bcc2e0ba8df2':
For 720dp devices, less motion during task-to-task transition.
Brandon Keely [Fri, 25 May 2012 21:38:47 +0000 (14:38 -0700)]
Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev
Eric Fischer [Fri, 25 May 2012 21:28:07 +0000 (14:28 -0700)]
am
dfaadf9d: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
dfaadf9dae65e4e3cee7430908c98614bb208d20':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 25 May 2012 21:24:44 +0000 (14:24 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Fri, 25 May 2012 21:18:47 +0000 (14:18 -0700)]
am
aed9b810: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
aed9b810a538fa02cc5f104e29841c90977ebeaa':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 25 May 2012 21:14:55 +0000 (14:14 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Christopher Tate [Fri, 25 May 2012 21:14:49 +0000 (14:14 -0700)]
Prevent construction/use of invalid restore session proxies
Possible (rare) null return was not being handled. Fixes
bug
6554812.
Change-Id: I470e916f2156ff7ed2947d6ce21ef2816fc7f97d
John Reck [Fri, 25 May 2012 21:02:26 +0000 (14:02 -0700)]
Copy over the scroll position for the scrolling layer
Bug:
6557664
Change-Id: I9b1257ee0a4d75f5b445e9f72455d51e4add1c77
Fabrice Di Meglio [Fri, 25 May 2012 20:52:46 +0000 (13:52 -0700)]
am
d5f3798d: Merge "Fix bug #
6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key" into jb-dev
* commit '
d5f3798d6b5cc6404aa03396b440b56415f00ca8':
Fix bug #
6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key
Fabrice Di Meglio [Fri, 25 May 2012 20:49:39 +0000 (13:49 -0700)]
Merge "Fix bug #
6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key" into jb-dev
Chet Haase [Fri, 25 May 2012 19:59:01 +0000 (12:59 -0700)]
Make Google search panel go away when receiving phone call
Issue #
6557847 "Google" launcher icon stuck in ring slider after getting incoming call
Change-Id: If77f66fd241af7fbfe6228498b07fd1cfcef36bd
Eric Fischer [Fri, 25 May 2012 20:32:45 +0000 (13:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I893c25a4fd206d9b0c018c44e4441ef36d12eed0
Fabrice Di Meglio [Fri, 25 May 2012 18:36:03 +0000 (11:36 -0700)]
Fix bug #
6558264 Recent apps launcher is not getting dismissed after launching Google app using long press of Home key
- close Recent Apps before launching the Assistant
Change-Id: I823dc254252fb3c1fde0a3adcfb895e368c7d77e
Eric Fischer [Fri, 25 May 2012 20:11:43 +0000 (13:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3528164ed7d96f571cf31df0715100da5120b082
Irfan Sheriff [Fri, 25 May 2012 00:16:50 +0000 (17:16 -0700)]
Retain device during connecting state
With join taking much longer, sometimes device can be lost from supplicant.
Retain device to complete connection.
Also, clear up stale peer data after find stops during inactive state.
Bug:
6557725
Change-Id: I15b92e50a837481f974034b1ea7b32c8abee969e
Gilles Debunne [Fri, 25 May 2012 19:46:09 +0000 (12:46 -0700)]
am
18afc622: Merge "Fix for IOOB in SearchView" into jb-dev
* commit '
18afc622c3d80713a6ffb91792cce399e1715bfb':
Fix for IOOB in SearchView
Gilles Debunne [Fri, 25 May 2012 19:43:39 +0000 (12:43 -0700)]
Merge "Fix for IOOB in SearchView" into jb-dev
Jean-Baptiste Queru [Fri, 25 May 2012 19:27:05 +0000 (12:27 -0700)]
am
735470d2: (-s ours) am
23cad6eb: Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"
* commit '
735470d202cd42fe8b65f0fb0d6c38aff2be967e':
stagefright aacenc: Fix reading out of bounds in pow2_xy
Romain Guy [Fri, 25 May 2012 19:08:39 +0000 (12:08 -0700)]
Tale of status bar on crespo, part 3
Bug #
6541079
The vanished shall not be forgotten.
Change-Id: If01a53d8c203ef82e54d0b440063a8dbebe7b14a
Romain Guy [Fri, 25 May 2012 18:45:55 +0000 (11:45 -0700)]
am
bc1387b1: Merge "Tale of status bar on crespo, part 2 Bug #
6541079" into jb-dev
* commit '
bc1387b11c530a751c1c6075d16cac2e48a4b932':
Tale of status bar on crespo, part 2 Bug #
6541079
Romain Guy [Fri, 25 May 2012 18:43:13 +0000 (11:43 -0700)]
Merge "Tale of status bar on crespo, part 2 Bug #
6541079" into jb-dev
Jean-Baptiste Queru [Fri, 25 May 2012 18:34:02 +0000 (11:34 -0700)]
am
23cad6eb: Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"
* commit '
23cad6eb2b42f023a8f2197cd358de87f9084b99':
stagefright aacenc: Fix reading out of bounds in pow2_xy
Romain Guy [Fri, 25 May 2012 17:44:45 +0000 (10:44 -0700)]
Tale of status bar on crespo, part 2
Bug #
6541079
In which a flood destroys flatland.
Change-Id: Ifd1913b645c08531b221b3e010c133f14bcfb0c2
Jean-Baptiste Queru [Fri, 25 May 2012 17:38:05 +0000 (10:38 -0700)]
Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"
Irfan Sheriff [Fri, 25 May 2012 17:35:44 +0000 (10:35 -0700)]
am
da87c7c1: Merge "Fix delayed wifi shutdown" into jb-dev
* commit '
da87c7c1eea9a054fd6842995df115113228191d':
Fix delayed wifi shutdown
Romain Guy [Fri, 25 May 2012 17:31:53 +0000 (10:31 -0700)]
am
53210964: Merge "Tale of status bar on crespo, part 1 Bug #
6541079" into jb-dev
* commit '
53210964673640166c8824c580344b06e8f8e28c':
Tale of status bar on crespo, part 1 Bug #
6541079
Irfan Sheriff [Fri, 25 May 2012 17:31:46 +0000 (10:31 -0700)]
Merge "Fix delayed wifi shutdown" into jb-dev
Romain Guy [Fri, 25 May 2012 17:28:01 +0000 (10:28 -0700)]
Merge "Tale of status bar on crespo, part 1 Bug #
6541079" into jb-dev
Teng-Hui Zhu [Fri, 25 May 2012 17:13:08 +0000 (10:13 -0700)]
am
65e08329: Merge "Better support for HTML5 audio loop." into jb-dev
* commit '
65e08329ee57f2c4cda679885db700ceaca6c842':
Better support for HTML5 audio loop.
Teng-Hui Zhu [Fri, 25 May 2012 17:10:11 +0000 (10:10 -0700)]
Merge "Better support for HTML5 audio loop." into jb-dev
Martin Storsjo [Fri, 25 May 2012 16:46:34 +0000 (19:46 +0300)]
stagefright aacenc: Fix reading out of bounds in pow2_xy
This fixes cases where x was a large number, causing fPart to
exceed the 32 bit signed integer range (while fitting in an
unsigned 32 bit integer), making the table index a negative
number.
Change-Id: I674047db65f89148a93d218c138b42cd8305f80e
Jean-Baptiste Queru [Fri, 25 May 2012 15:13:03 +0000 (08:13 -0700)]
am
541803cc: am
fd63c857: Merge "Wipe the user data out in any case."
* commit '
541803ccc530b8cc1d8d95aa5a82ebc191fc218c':
Wipe the user data out in any case.
Jean-Baptiste Queru [Fri, 25 May 2012 15:09:39 +0000 (08:09 -0700)]
am
fd63c857: Merge "Wipe the user data out in any case."
* commit '
fd63c85742f4b12065418d48ae10be4bb12468f5':
Wipe the user data out in any case.
Jean-Baptiste Queru [Fri, 25 May 2012 14:31:26 +0000 (07:31 -0700)]
Merge "Wipe the user data out in any case."
Amith Yamasani [Fri, 25 May 2012 14:29:39 +0000 (07:29 -0700)]
am
d2f4d60e: (-s ours) am
d4cb08df: Merge "FileInputStream is not closed in "UserManager.java : readUserList()""
* commit '
d2f4d60edff4892dd0e17f9a0244597782e3c12a':
FileInputStream is not closed in "UserManager.java : readUserList()"
Chris Wren [Fri, 25 May 2012 13:24:12 +0000 (06:24 -0700)]
am
04b63f6f: Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev
* commit '
04b63f6fb0f04e0cd56a6c2d71c8c4f1f2207758':
Squelch the logs from SizeAdaptiveLayout.
Chris Wren [Fri, 25 May 2012 13:21:55 +0000 (06:21 -0700)]
Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev
Gilles Debunne [Fri, 25 May 2012 12:04:01 +0000 (14:04 +0200)]
Fix for IOOB in SearchView
Bug
6476578
The latest bug report show a query.length() of 33 while
mQueryTextView.length() is 0 on line 514.
I can see 2 reasons which can explain this discrepancy:
- the mQueryTextView has a filter, which alters the text.
- some asynchronous event (IME?) changes the text in the mean time.
I would favor the second one, which seems to break a lot of single
thread assumptions in the code and generates other IOOB exceptions.
Note that depending on what they are used for, it may be more consistent
to use mQueryTextView.getText() instead of query in the following
assignment.
Change-Id: Ie8a5486b11a80543f8f90980454933c5a74c073e