Commit Graph

25432 Commits

Author SHA1 Message Date
Christopher Tate
0a406096bd am 03ab4eb5: am aefe4aa4: Merge "Prevent construction/use of invalid restore session proxies" into jb-dev
* commit '03ab4eb550d3f1c5b3959d9433e925731a215c4e':
  Prevent construction/use of invalid restore session proxies
2012-05-29 16:01:44 -07:00
Dianne Hackborn
ce783749b1 am f3b4c93e: am ae5811c7: Merge "Fix (mostly) issue #5109947: Race condition between retrieving a..." into jb-dev
* commit 'f3b4c93e0da9af2db9e16864faa734cf70fecfe3':
  Fix (mostly) issue #5109947: Race condition between retrieving a...
2012-05-29 15:57:52 -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
Svetoslav Ganov
b042f2d990 am 09dfd60b: am bb1b7cf6: Merge "Adding accessibility focusable attribute (hidden for now)." into jb-dev
* commit '09dfd60bc37585e2670e4ca997940256e5b21ac8':
  Adding accessibility focusable attribute (hidden for now).
2012-05-29 15:51:50 -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
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
Wink Saville
de1a43f69e Merge "When we disconnect shutdown the StateMachine." 2012-05-29 14:23:05 -07:00
Wink Saville
4b5d3a2639 Merge "Enhance StateMachine Quitting and logging support." 2012-05-29 14:22:50 -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
273135b863 am 4abf86ed: am a073e570: Fix 6398209: General animation improvements for swipe to search
* commit '4abf86ed20fdc87f34362fad5f8a51798a2d0d88':
  Fix 6398209: General animation improvements for swipe to search
2012-05-29 13:19:12 -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
Jim Miller
a073e57078 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
2012-05-29 12:49:23 -07:00
Wink Saville
f3110dfc84 When we disconnect shutdown the StateMachine.
Need to stop the StateMachine threads and release
all resources when we disconnect.

bug: 6342470
Change-Id: Ibf7a2ebf4f7ecd667c5d95579e66ecd5086103ea
2012-05-29 12:41:09 -07:00
Wink Saville
bbf30dfd76 Enhance StateMachine Quitting and logging support.
Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.

Rename halting to onHalting.

Add onQuitting

Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.


bug: 5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7
2012-05-29 12:40:46 -07:00
Ben Murdoch
1bd37b176e Deprecate WebChromeClient.onJsTimeout
This method was only supported with the JSC JavaScript engine.
V8 became the default JavaScript engine in Froyo and this method
has not been invoked since. Support for building JSC was removed
in b/5495373.

Bug: 6295376
Change-Id: I3dbe83f375b88ebbbb713d3c3fa5a2fa323a0d45
2012-05-28 14:20:07 +01:00
John Reck
83a40e8e64 am 2611f1ec: am 7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev
* commit '2611f1eced80db74d07563e03bb99a146aa461b6':
  Copy over the scroll position for the scrolling layer
2012-05-25 15:56:48 -07:00
John Reck
2611f1eced 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
2012-05-25 15:51:58 -07:00
John Reck
7cbe645730 Merge "Copy over the scroll position for the scrolling layer" into jb-dev 2012-05-25 15:49:15 -07:00
Christopher Tate
f5491fc1b6 Prevent construction/use of invalid restore session proxies
Possible (rare) null return was not being handled.  Fixes
bug 6554812.

Change-Id: I470e916f2156ff7ed2947d6ce21ef2816fc7f97d
2012-05-25 14:14:49 -07:00
John Reck
ec1b71adc6 Copy over the scroll position for the scrolling layer
Bug: 6557664

Change-Id: I9b1257ee0a4d75f5b445e9f72455d51e4add1c77
2012-05-25 14:02:26 -07:00
Gilles Debunne
31d869ce07 am 1cf99631: am 18afc622: Merge "Fix for IOOB in SearchView" into jb-dev
* commit '1cf99631ca6859785ef5716def75169f77b1bee3':
  Fix for IOOB in SearchView
2012-05-25 12:50:14 -07:00
Gilles Debunne
1cf99631ca am 18afc622: Merge "Fix for IOOB in SearchView" into jb-dev
* commit '18afc622c3d80713a6ffb91792cce399e1715bfb':
  Fix for IOOB in SearchView
2012-05-25 12:46:09 -07:00
Gilles Debunne
18afc622c3 Merge "Fix for IOOB in SearchView" into jb-dev 2012-05-25 12:43:39 -07:00
Christopher Tate
c0ed6efe5f am 115284bc: Merge "Support volume-changed sounds on master-volume-only configs" into ics-aah
* commit '115284bc124ce2874f32ad36956f475959513388':
  Support volume-changed sounds on master-volume-only configs
2012-05-25 11:57:35 -07:00
Teng-Hui Zhu
0926424028 am 314745cd: am 65e08329: Merge "Better support for HTML5 audio loop." into jb-dev
* commit '314745cd5661db8672505ec753a6f88b9e80e609':
  Better support for HTML5 audio loop.
2012-05-25 10:18:09 -07:00
Teng-Hui Zhu
314745cd56 am 65e08329: Merge "Better support for HTML5 audio loop." into jb-dev
* commit '65e08329ee57f2c4cda679885db700ceaca6c842':
  Better support for HTML5 audio loop.
2012-05-25 10:13:08 -07:00
Teng-Hui Zhu
65e08329ee Merge "Better support for HTML5 audio loop." into jb-dev 2012-05-25 10:10:11 -07:00
Jean-Baptiste Queru
4b33266935 am c6df8417: am 541803cc: am fd63c857: Merge "Wipe the user data out in any case."
* commit 'c6df8417eaf60f80b2741ec29e8188324de95af3':
  Wipe the user data out in any case.
2012-05-25 08:17:49 -07:00
Jean-Baptiste Queru
c6df8417ea am 541803cc: am fd63c857: Merge "Wipe the user data out in any case."
* commit '541803ccc530b8cc1d8d95aa5a82ebc191fc218c':
  Wipe the user data out in any case.
2012-05-25 08:13:03 -07:00
Jean-Baptiste Queru
541803ccc5 am fd63c857: Merge "Wipe the user data out in any case."
* commit 'fd63c85742f4b12065418d48ae10be4bb12468f5':
  Wipe the user data out in any case.
2012-05-25 08:09:39 -07:00
Jean-Baptiste Queru
fd63c85742 Merge "Wipe the user data out in any case." 2012-05-25 07:31:27 -07:00
Chris Wren
adde6eb394 am af948894: am 04b63f6f: Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev
* commit 'af948894195d2af09295210d4266bb45c4f4ba9e':
  Squelch the logs from SizeAdaptiveLayout.
2012-05-25 06:27:45 -07:00
Chris Wren
af94889419 am 04b63f6f: Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev
* commit '04b63f6fb0f04e0cd56a6c2d71c8c4f1f2207758':
  Squelch the logs from SizeAdaptiveLayout.
2012-05-25 06:24:12 -07:00
Chris Wren
04b63f6fb0 Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev 2012-05-25 06:21:56 -07:00
Gilles Debunne
2427192e58 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
2012-05-25 14:04:05 +02:00
Jean-Michel Trivi
3266873f7f am b3db8dc9: am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev
* commit 'b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9':
  Unhide KeyguardManager locked and secure state getters
2012-05-24 18:34:07 -07:00
Jean-Michel Trivi
b3db8dc9f1 am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev
* commit '97594d6cea4dfcfc6bc41bcf2ef7bd2e461cd13e':
  Unhide KeyguardManager locked and secure state getters
2012-05-24 18:29:39 -07:00
Jean-Michel Trivi
97594d6cea Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev 2012-05-24 18:27:37 -07:00
John Reck
fcf4c34545 am 731327a9: am f7388102: Merge "Support skipping a touch stream due to lack of handlers" into jb-dev
* commit '731327a93a9e5f1550effaf48fb944d8cae507d5':
  Support skipping a touch stream due to lack of handlers
2012-05-24 18:18:07 -07:00
John Reck
731327a93a am f7388102: Merge "Support skipping a touch stream due to lack of handlers" into jb-dev
* commit 'f738810247b887082dbf4ca3a867f8d9e1955001':
  Support skipping a touch stream due to lack of handlers
2012-05-24 18:13:52 -07:00
John Reck
f738810247 Merge "Support skipping a touch stream due to lack of handlers" into jb-dev 2012-05-24 18:11:36 -07:00
Jean-Michel Trivi
37fde0aca0 Unhide KeyguardManager locked and secure state getters
Unhide the following methods:
  android.app.KeyguardManager.isKeyguardLocked()
  android.app.KeyguardManager.isKeyguardSecure()

Fix some javadoc typos

Change-Id: Iedcd9f6a5261b7a3b47431edff013f629e1dc45d
2012-05-24 18:09:44 -07:00
Jim Miller
9a1a3ab84e am 4414bdef: am 73bde11e: Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev
* commit '4414bdefe1ac1559f2c4d2658a28ed80abc84482':
  Fix 6547012: ignore events outside the home/back/recent navigation area
2012-05-24 17:59:54 -07:00
Jim Miller
4414bdefe1 am 73bde11e: Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev
* commit '73bde11e624c44620819e9c93a61ca6be6e96997':
  Fix 6547012: ignore events outside the home/back/recent navigation area
2012-05-24 17:56:02 -07:00
Jim Miller
73bde11e62 Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev 2012-05-24 17:51:10 -07:00
Christopher Tate
c4b78d206f Support volume-changed sounds on master-volume-only configs
Some products manipulate only the master volume, and the existing
code does not play volume-change tones when the master volume
is adjusted.  This CL includes some config-driven behavior that
will play those tones (via the system stream) if desired.

Bug 6498986

Change-Id: I2415773325d0a0039efc67897bc371b1f2e18063
2012-05-24 17:30:39 -07:00