9537 Commits

Author SHA1 Message Date
John Spurlock
960779d3bb Dock: Renable desk-dock apps
Revert to pre-dreams behavior. DeskClock once again launches the correct
activity (instead of Screensaver) when desk-dock is attached.

Bug: 6559590
Change-Id: I32a03a25469f17b5e87e16831839ec757d56c90b
2012-05-29 18:19:57 -04:00
Wink Saville
4b5d3a2639 Merge "Enhance StateMachine Quitting and logging support." 2012-05-29 14:22:50 -07:00
Craig Mautner
92f4ebe3b4 am d1b1bef4: am de1ddd0f: Merge "Better handle changing app transitions." into jb-dev
* commit 'd1b1bef46329875318fff087fefb21d7d65906b1':
  Better handle changing app transitions.
2012-05-29 13:59:04 -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
Craig Mautner
de1ddd0f93 Merge "Better handle changing app transitions." into jb-dev 2012-05-29 13:53:06 -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
Craig Mautner
1d961d46d6 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
2012-05-29 13:00:25 -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
Craig Mautner
c5c3a41f08 am dfcdde79: am 1dee8974: Merge "Track animating apps up until animation starts." into jb-dev
* commit 'dfcdde790299ade3417a89cf8ff1aa9f3c46e5a3':
  Track animating apps up until animation starts.
2012-05-29 11:52:35 -07:00
Craig Mautner
dfcdde7902 am 1dee8974: Merge "Track animating apps up until animation starts." into jb-dev
* commit '1dee8974693fff55e276e0aed1202e43904bb944':
  Track animating apps up until animation starts.
2012-05-29 11:48:45 -07:00
Craig Mautner
1dee897469 Merge "Track animating apps up until animation starts." into jb-dev 2012-05-29 11:45:16 -07:00
Craig Mautner
06a94f710d 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
2012-05-29 10:46:00 -07:00
Nick Pelly
00355d5a59 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
2012-05-29 13:36:46 +02:00
Jeff Brown
401950e3d4 am 9026fecd: am d4cf7e7b: Merge "Don\'t ANR on hover, scroll or if a window goes away." into jb-dev
* commit '9026fecd517020d70d62379c49e749d25a65a9cb':
  Don't ANR on hover, scroll or if a window goes away.
2012-05-25 18:44:54 -07:00
Jeff Brown
9026fecd51 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.
2012-05-25 18:41:20 -07:00
Jeff Brown
d4cf7e7b06 Merge "Don't ANR on hover, scroll or if a window goes away." into jb-dev 2012-05-25 18:38:24 -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
fd63c85742 Merge "Wipe the user data out in any case." 2012-05-25 07:31:27 -07:00
Jeff Brown
8249fc6183 Don't ANR on hover, scroll or if a window goes away.
Prevents ANR on hover or scroll events.

Prevents ANR in the case where one finger touches a window which
is subsequently removed then a second finger comes along and tries
to touch something.

Change-Id: I985ccb70cd86659992328f14f8a705f3f05ea2e5
2012-05-24 19:34:39 -07:00
Craig Mautner
609c6e331b am 013772f2: am 2af7b915: Merge "Redraw all windows earlier in power on sequence." into jb-dev
* commit '013772f2d6f0a0aec96b90a768ff198a27289eac':
  Redraw all windows earlier in power on sequence.
2012-05-24 17:56:30 -07:00
Craig Mautner
013772f2d6 am 2af7b915: Merge "Redraw all windows earlier in power on sequence." into jb-dev
* commit '2af7b9151f8df3581e38847ac711185426df5dea':
  Redraw all windows earlier in power on sequence.
2012-05-24 17:52:23 -07:00
Craig Mautner
2af7b9151f Merge "Redraw all windows earlier in power on sequence." into jb-dev 2012-05-24 17:48:44 -07:00
Craig Mautner
3d7b7d59c8 Redraw all windows earlier in power on sequence.
Send a message to all windows to redraw before notifying
PhoneWindowManager of screen on. This minimizes the delay in
screen update that causes the keyguard clock to display the old time
before displaying the current time.

Fixes bug 6381021.

Change-Id: Ida7071e7dac2284540f101c5d004511b52133b91
2012-05-24 15:38:54 -07:00
Robert Greenwalt
4dfc783beb am 8a9d8f06: am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev
* commit '8a9d8f068c29b8d195ffdcc250dccf7bcecd5f53':
  Modify logging to debug this issue
2012-05-24 12:34:00 -07:00
Robert Greenwalt
8a9d8f068c am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev
* commit '1ed1de7ab2ae03f82500dbf6272bf036d89bd0c9':
  Modify logging to debug this issue
2012-05-24 12:30:20 -07:00
Robert Greenwalt
1ed1de7ab2 Merge "Modify logging to debug this issue" into jb-dev 2012-05-24 12:27:23 -07:00
Jeff Sharkey
fe3297dd34 am a3a7bcbd: am 6385ff51: Merge "Advise persist threshold outside NPMS lock." into jb-dev
* commit 'a3a7bcbda43ebddbf7bdd70c12258d1f1066c931':
  Advise persist threshold outside NPMS lock.
2012-05-24 11:47:44 -07:00
Jeff Sharkey
a3a7bcbda4 am 6385ff51: Merge "Advise persist threshold outside NPMS lock." into jb-dev
* commit '6385ff511dd998f1fbb189621270e2c19577f66e':
  Advise persist threshold outside NPMS lock.
2012-05-24 11:42:53 -07:00
Jeff Sharkey
6385ff511d Merge "Advise persist threshold outside NPMS lock." into jb-dev 2012-05-24 11:38:12 -07:00
Fabrice Di Meglio
c30d1ad8f3 am 07e28d1e: am 0100625b: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
* commit '07e28d1e9bd7373c83cb66d5d9e93ae9af1f090d':
  Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
2012-05-24 11:13:42 -07:00
Robert Greenwalt
5a0c320a82 Modify logging to debug this issue
Logging exec time on startUsingNetworkFeature as we've had some reports suggesting it's
causing ANRs.
Remove some logging from NDC so it's local log is more useful.

bug:6492166
Change-Id: I258ff6c59bff2c65935242d50496d84720c5d493
2012-05-24 10:47:10 -07:00
Fabrice Di Meglio
07e28d1e9b am 0100625b: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
* commit '0100625bb316ecbd99873b72756ffba8613c3456':
  Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
2012-05-24 10:45:54 -07:00
Fabrice Di Meglio
0100625bb3 Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev 2012-05-24 10:42:23 -07:00
Jeff Sharkey
e19f39b79c Advise persist threshold outside NPMS lock.
Bug: 6492166
Change-Id: Ibebdc7e9b8cae27c12fd7b61b53ab60287a0364d
2012-05-24 10:21:16 -07:00
Amith Yamasani
d4cb08df75 Merge "FileInputStream is not closed in "UserManager.java : readUserList()"" 2012-05-24 09:42:29 -07:00
satok
c0fbe54f0b am 13236440: am 7018a90c: Fix the issue on matching the locale in TextServicesManagerService
* commit '13236440148d7ab2f56f7c2df03ff41baeb16c7f':
  Fix the issue on matching the locale in TextServicesManagerService
2012-05-24 03:40:01 -07:00
satok
1323644014 am 7018a90c: Fix the issue on matching the locale in TextServicesManagerService
* commit '7018a90c323a7f0deb37939d5505ff112ac637f5':
  Fix the issue on matching the locale in TextServicesManagerService
2012-05-24 03:35:55 -07:00
satok
7018a90c32 Fix the issue on matching the locale in TextServicesManagerService
Bug: 6542210

Change-Id: I42d84b684d5689e8fceecb705bb51d19d847477a
2012-05-24 18:21:45 +09:00
Craig Mautner
74f41ae14d am ca414550: am 67e6070f: Merge "Change method of tracking moving AppWindowTokens." into jb-dev
* commit 'ca414550d3d431345f4efbee762ea87fe55295af':
  Change method of tracking moving AppWindowTokens.
2012-05-23 18:37:37 -07:00
Craig Mautner
1fb5b3d4e6 am 270db713: am 9cf5831f: Merge "Fix jank when launching apps that show wallpaper." into jb-dev
* commit '270db71381e107e3b3bc81890b3f34424403ef9b':
  Fix jank when launching apps that show wallpaper.
2012-05-23 18:34:35 -07:00
Craig Mautner
ca414550d3 am 67e6070f: Merge "Change method of tracking moving AppWindowTokens." into jb-dev
* commit '67e6070fa10bbd313c8ebe0de4e0440b688c569e':
  Change method of tracking moving AppWindowTokens.
2012-05-23 18:34:19 -07:00
Craig Mautner
270db71381 am 9cf5831f: Merge "Fix jank when launching apps that show wallpaper." into jb-dev
* commit '9cf5831f2b94f5e2edd7fd87abef4e9fac8aa82d':
  Fix jank when launching apps that show wallpaper.
2012-05-23 18:31:25 -07:00
Craig Mautner
67e6070fa1 Merge "Change method of tracking moving AppWindowTokens." into jb-dev 2012-05-23 18:30:25 -07:00
Craig Mautner
9cf5831f2b Merge "Fix jank when launching apps that show wallpaper." into jb-dev 2012-05-23 18:29:39 -07:00
Craig Mautner
ef25d7a019 Change method of tracking moving AppWindowTokens.
Stop trying to keep track of the AppTokens that have been moved
to the top and bottom and then try and match the WindowStates when
transitions are goodToGo. Instead rebuild the WindowState order based
on the AppToken order when we are goodToGo.

When moving AppWindowTokens lower in mAppTokens create a new ArrayList
of AppWindowTokens to keep track of the apps in Z order while
animating.

Fixes bug 6481078.

Change-Id: I29b33a507b45752f15feb10a9f4b47a3f5eb9f0e
2012-05-23 17:07:36 -07:00
Craig Mautner
8e4df6c1e2 Fix jank when launching apps that show wallpaper.
Do not create a StartingWindow for apps that show wallpaper.
Fix handling of obscure case where found wallpaper is hidden.

Fixes bug 6484034.

Change-Id: I07181c4aea56fa9e530df0c95d886fe8ad61ec9d
2012-05-23 16:57:23 -07:00
Fabrice Di Meglio
13fe2a5330 Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
- use an ID instead of a String for StorageVolume description
- use this ID for getting the correct localized version of the description string

Change-Id: I30f3080fce2c889be38bfdf9f5121dffcf8a99e8
2012-05-23 16:38:09 -07:00
Svetoslav Ganov
762932396a am 97490bc6: am 2205d204: Merge "System accessibility state update postponed if UI test autmation is running." into jb-dev
* commit '97490bc65a1307e276b341601cb5894568ac350a':
  System accessibility state update postponed if UI test autmation is running.
2012-05-23 16:08:51 -07:00
Svetoslav Ganov
97490bc65a am 2205d204: Merge "System accessibility state update postponed if UI test autmation is running." into jb-dev
* commit '2205d20421994d4e31994c298a22cb8fd9232fb6':
  System accessibility state update postponed if UI test autmation is running.
2012-05-23 16:05:07 -07:00