9686 Commits

Author SHA1 Message Date
John Spurlock
e857632abd Merge "Dock: Renable desk-dock apps" into jb-dev 2012-05-31 08:44:47 -07:00
Eric Laurent
c383b407ad am cee7203f: Merge "Send device connection intents from AudioService" into jb-dev
* commit 'cee7203f9ac3e54f39b5f528e014f2d3583f60dc':
  Send device connection intents from AudioService
2012-05-31 08:25:33 -07:00
Eric Laurent
cee7203f9a Merge "Send device connection intents from AudioService" into jb-dev 2012-05-31 08:22:50 -07:00
Mathias Agopian
1a7d90c42a am 7f651969: Merge "fix a potential buffer overflow in sensorservice" into jb-dev
* commit '7f6519691fdd8062a090de74cfc5d2a906f9e5f6':
  fix a potential buffer overflow in sensorservice
2012-05-30 19:16:47 -07:00
Mathias Agopian
7f6519691f Merge "fix a potential buffer overflow in sensorservice" into jb-dev 2012-05-30 19:11:33 -07:00
Svetoslav Ganov
191e7c5a49 am 758534ed: Merge "Ask to enable touch exploration only the first time it enables the feature." into jb-dev
* commit '758534ed50d1d2c643999bd7eb3f909b0834e393':
  Ask to enable touch exploration only the first time it enables the feature.
2012-05-30 19:08:52 -07:00
Svetoslav Ganov
758534ed50 Merge "Ask to enable touch exploration only the first time it enables the feature." into jb-dev 2012-05-30 19:06:23 -07:00
Svetoslav Ganov
9a4c5cd191 Ask to enable touch exploration only the first time it enables the feature.
1. Now we are asking the user to grant permission to the service to enable
   touch exploration only the first time this service is enabled. If the
   service was uninstalled and then later installed we ask the user again.
   This avoids the scenario in which rebooting the device or upgrading an
   accessibility service leaves the device in a state in which the user
   cannot interact with.

bug:6582088

Change-Id: I51d24e4892b3b48c9fb11dfb09ec1118502ba526
2012-05-30 18:41:08 -07:00
Mathias Agopian
acd31516c6 fix a potential buffer overflow in sensorservice
Bug: 6580560
Change-Id: Icf6cafbca09174515a964a7cd69d8cc589ad52de
2012-05-30 18:08:30 -07:00
Dianne Hackborn
d89e3b77fe am efc620a8: Merge "Add time stamp to content provider connection." into jb-dev
* commit 'efc620a8b905fbe0903b8bac6ecfe91fda6f03be':
  Add time stamp to content provider connection.
2012-05-30 17:23:20 -07:00
Dianne Hackborn
efc620a8b9 Merge "Add time stamp to content provider connection." into jb-dev 2012-05-30 17:20:28 -07:00
Dianne Hackborn
d9137ca87e Add time stamp to content provider connection.
For help in tracking down memory use issues, seeing how long
a connection has been held that is keeping other processes around.

Let's call this for issue #6577613: Unbelievably sluggish nexus-S

Change-Id: Ia3d016c5ed9d2155eea18ec884047e1e1d8a0ad5
2012-05-30 15:29:36 -07:00
Jeff Brown
bbffc261cc am 9154b877: Merge "Fix comparison of device source bits." into jb-dev
* commit '9154b877807a1222abf46608cdff66428e906328':
  Fix comparison of device source bits.
2012-05-30 15:02:59 -07:00
Jeff Brown
9154b87780 Merge "Fix comparison of device source bits." into jb-dev 2012-05-30 15:00:39 -07:00
Eric Laurent
b1fbaaccb6 Send device connection intents from AudioService
AudioService is currently notified of wired headset and A2DP
sink connection states via broadcast intents from WiredAccessoryObserver
and BluetoothA2dpService. This is a problem as there is no guaranty that
AudioService can take actions upon the change before other apps are notified.
For instance, the Play On feature requires the UI to be refreshed when a device
is inserted/removed and we must guaranty that the UI component can read
new A2DP enable state from AudioManager after it receives a device connection state
change intent.

- Added hidden methods to AudioManager so that WiredAccessoryObserver
and BluetoothA2dpService can notify AudioService of device connection directly.
- The wired accessories connection intents are now sent by AudioService.
- The A2DP state change intent is delayed by BluetoothA2DPService when
ACTION_AUDIO_BECOMING_NOISY is sent by AudioService
- ACTION_AUDIO_BECOMING_NOISY intent is not sent when disconnecting A2DP
while a wired headset is present and vice versa.

Bug 6485897.

Change-Id: Ie160b3ee5f451132065530772b868593c90afd94
2012-05-30 14:44:43 -07:00
Jeff Brown
7e4ff4b986 Fix comparison of device source bits.
Bug: 6576743
Change-Id: I6952b052e2ab9e62ddd46ab76f4df37ecc656757
2012-05-30 14:32:16 -07:00
Dianne Hackborn
defc301908 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...
2012-05-30 11:20:48 -07:00
Dianne Hackborn
26627ccc3f Merge "A little debug code from issue #6516197: Places app not getting removed..." into jb-dev 2012-05-30 11:18:08 -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
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
Dianne Hackborn
7f96b7961b A little debug code from issue #6516197: Places app not getting removed...
...from recent apps drawer after launching Places app

Change-Id: Ibfa75e9cea2721a7380d7c13dc21504fbce61aee
2012-05-29 18:46:45 -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
Dianne Hackborn
ae5811c714 Merge "Fix (mostly) issue #5109947: Race condition between retrieving a..." into jb-dev 2012-05-29 15:51:24 -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
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
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
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
Zhenghua Wang
edded60d18 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>
2012-05-28 21:56:03 +08: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
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
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
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
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