12512 Commits

Author SHA1 Message Date
Victoria Lease
5b6069ce3a Merge "Wrong parameter in LocationManagerService" 2012-12-06 12:45:46 -08:00
Jianzheng Zhou
dcf03f3972 Refactor getPersistedNetworkPreference
Optimize for updating mNetworkPreference according to device's networkAttributes
setting from overlay config.xml when connectivityservice start.

Change-Id: I90286332d4f453038f1ddac7dd9d1265d96b4859
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2012-12-06 12:00:04 -08:00
You Kim
87c1b3127e Wrong parameter in LocationManagerService
Fix wrong parameter in removeTestProvider

Change-Id: Ibf93833697c865904f29821e5778853127e5fb00
Signed-off-by: You Kim <you.kim72@gmail.com>
2012-12-07 04:33:05 +09:00
Victoria Lease
bc36b52372 am 7b085571: Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev
* commit '7b0855715bc6cb14e3ca67d815915d2172f0bc12':
  DO NOT MERGE Adjust update interval when expiring location requests.
2012-12-05 14:06:33 -08:00
Victoria Lease
7b0855715b Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev 2012-12-05 14:03:28 -08:00
Jeff Brown
384e6fe84d am 1edc6111: am 61e21940: am 7fcb5dc5: Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev
* commit '1edc61119d145b05f0b5e1323a2fc0fa6a29d4bc':
  Pin electron beam surface to natural orientation.
2012-12-05 12:28:25 -08:00
satok
fb21aa84a8 am 8ec9f8f0: am dc5b21a5: am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev
* commit '8ec9f8f074ea35cad6e6a75a87e4bde947f12ea1':
  Fix an issue on installing 3rd-party IME by a non-primary user
2012-12-05 12:28:17 -08:00
Sascha Prueter
cc6f467c35 am 98c95809: am 8f7eddbe: am 652d8fc9: Merge "PRIORITY_MIN notifications should be truly ambient." into jb-mr1.1-dev
* commit '98c958097b0dd458ffd3e12f9692c0c9522d932e':
  PRIORITY_MIN notifications should be truly ambient.
2012-12-05 12:23:38 -08:00
John Spurlock
de8f01a99b am d201bf77: am 9c902ca4: am 33669f35: Merge "Kill dreams that do not create a timely service connection." into jb-mr1.1-dev
* commit 'd201bf77be606fb21ef469e0174d64a919f92887':
  Kill dreams that do not create a timely service connection.
2012-12-05 12:23:19 -08:00
Victoria Lease
5959bf2d3c DO NOT MERGE Adjust update interval when expiring location requests.
Cherry-pick I88b419c92940b7e536d48b26e5fc0f72f3c9e73d

This is a more complete solution for this issue that disables
location providers when expiring their last request *and* adjusts
update intervals when expiring any request. This should help
further limit battery drain when a high-frequency-update app
exits, as it allows the system to throttle the update interval
back down to something appropriate for the remaining listeners.

Bug: 7611837
Change-Id: I7629a90f4c693be4bf96d662bd3a8b06dae0b089
2012-12-05 12:15:16 -08:00
Victoria Lease
0a19ad089a Adjust update interval when expiring location requests.
This is a more complete solution for this issue that disables
location providers when expiring their last request *and* adjusts
update intervals when expiring any request. This should help
further limit battery drain when a high-frequency-update app
exits, as it allows the system to throttle the update interval
back down to something appropriate for the remaining listeners.

Bug: 7611837
Change-Id: I88b419c92940b7e536d48b26e5fc0f72f3c9e73d
2012-12-05 09:57:40 -08:00
Jeff Sharkey
29afa14240 Remove unnecessary locking for screen broadcasts.
The actual handling occurs in updateScreenOn() on the other side of a
handler, which acquires the lock correctly.

Change-Id: Ibd359446dba8e88f81d34f1e10a6b5e150348f89
2012-12-04 17:21:38 -08:00
Jeff Brown
1edc61119d am 61e21940: am 7fcb5dc5: Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev
* commit '61e21940ffd643dad1aa6c7c3dc9933815aecd74':
  Pin electron beam surface to natural orientation.
2012-12-04 17:21:00 -08:00
Jeff Brown
61e21940ff am 7fcb5dc5: Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev
* commit '7fcb5dc5e9fbad0f183f425e88e576aaca98b0d7':
  Pin electron beam surface to natural orientation.
2012-12-04 17:18:52 -08:00
Jeff Brown
7fcb5dc5e9 Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev 2012-12-04 17:15:34 -08:00
satok
8ec9f8f074 am dc5b21a5: am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev
* commit 'dc5b21a54850735bdfd1fbbd83375b2578ed4b02':
  Fix an issue on installing 3rd-party IME by a non-primary user
2012-12-04 17:14:17 -08:00
satok
dc5b21a548 am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev
* commit '487f8e93b0b5e2949fbfa6b60fd5e0a7a3e4d5b7':
  Fix an issue on installing 3rd-party IME by a non-primary user
2012-12-04 17:12:10 -08:00
satok
487f8e93b0 Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev 2012-12-04 17:09:57 -08:00
Craig Mautner
66f78d7a97 Share the pending layout changes
Do not pass the pending layout changes from animation to layout.
Simply assign them to the DisplayContent.

Change-Id: I72e48753db509023e5df70513a87e26998ec699f
2012-12-04 16:46:50 -08:00
Victoria Lease
6861e258f0 am 1d20e05e: am 82a76800: Merge "DO NOT MERGE Notify provider when disposing last UpdateRecord" into jb-mr1.1-dev
* commit '1d20e05e487faa02acca2dcb2ae9d527d097ce7d':
  DO NOT MERGE Notify provider when disposing last UpdateRecord
2012-12-04 16:35:23 -08:00
Sascha Prueter
98c958097b am 8f7eddbe: am 652d8fc9: Merge "PRIORITY_MIN notifications should be truly ambient." into jb-mr1.1-dev
* commit '8f7eddbef33f97e7d4439707ac0039be4c81ef0e':
  PRIORITY_MIN notifications should be truly ambient.
2012-12-04 16:35:12 -08:00
John Spurlock
d201bf77be am 9c902ca4: am 33669f35: Merge "Kill dreams that do not create a timely service connection." into jb-mr1.1-dev
* commit '9c902ca4732f8c2a5afda4047415d1de6d3db493':
  Kill dreams that do not create a timely service connection.
2012-12-04 16:34:55 -08:00
Victoria Lease
1d20e05e48 am 82a76800: Merge "DO NOT MERGE Notify provider when disposing last UpdateRecord" into jb-mr1.1-dev
* commit '82a76800ad78b7aa6e2bde2f6512e4ffbe21873f':
  DO NOT MERGE Notify provider when disposing last UpdateRecord
2012-12-04 16:32:18 -08:00
Sascha Prueter
8f7eddbef3 am 652d8fc9: Merge "PRIORITY_MIN notifications should be truly ambient." into jb-mr1.1-dev
* commit '652d8fc944c011eb15202f678588723aa9f38a84':
  PRIORITY_MIN notifications should be truly ambient.
2012-12-04 16:32:05 -08:00
John Spurlock
9c902ca473 am 33669f35: Merge "Kill dreams that do not create a timely service connection." into jb-mr1.1-dev
* commit '33669f35e4b63bec10bb7202b94340ebd41fbb10':
  Kill dreams that do not create a timely service connection.
2012-12-04 16:31:33 -08:00
Craig Mautner
968683335e Recouple layout and animation a bit.
Share state between layout and animation and stop copying
redundant data between the two.

Change-Id: If07d3fc3ddfd33e3d46bf45d24d7aca58067ee66
2012-12-04 16:20:08 -08:00
Craig Mautner
83323f427d Merge "Further decouple layout and animation." 2012-12-04 16:15:31 -08:00
Craig Mautner
9339c401cf Further decouple layout and animation.
Load animation parameters dynamically and synchronously rather than
asynchronously. Eliminates storing parameters and cross-barrier method
calls.

Change-Id: Ia9162f0cb3fe60da35fd9fb5f24f31f88891b950
2012-12-04 16:13:45 -08:00
Victoria Lease
e0fa1b387f DO NOT MERGE Notify provider when disposing last UpdateRecord
Cherry-pick of Id48151eb7de40164258cde7da220a4d6bb34b89a

Location providers were not being notified of the change in status
when the last UpdateRecord was removed due to numUpdates exhaustion
or request expiry. Oops! Enjoy some free battery life!

Bug: 7611837
Change-Id: I66303b355be4e4a56a81efb5406c9353b2588595
2012-12-04 15:42:22 -08:00
Sascha Prueter
652d8fc944 Merge "PRIORITY_MIN notifications should be truly ambient." into jb-mr1.1-dev 2012-12-04 15:13:17 -08:00
Victoria Lease
8b38b29b52 Notify provider when disposing last UpdateRecord
Location providers were not being notified of the change in status
when the last UpdateRecord was removed due to numUpdates exhaustion
or request expiry. Oops! Enjoy some free battery life!

Bug: 7611837
Change-Id: Id48151eb7de40164258cde7da220a4d6bb34b89a
2012-12-04 15:04:43 -08:00
Jeff Brown
7f3994ec2a Pin electron beam surface to natural orientation.
If a rotation occurred while the electron beam surface was showing,
the surface may have appeared in the wrong orientation.  We fix this
problem by adjusting the transformation matrix of the electron beam
surface according to the display orientation whenever a display
transaction occurs.

The rotation itself is allowed to proceed but it is not visible
to the user.  We must let this happen so that the lock screen
is correctly oriented when the screen is turned back on.

Note that the electron beam surface serves two purposes.

First, it is used to play the screen off animation.
When the animation is finished, the surface remains visible but is
solid black.  Then we turn the screen off.

Second, when we turn the screen back on we leave the electron beam
surface showing until the window manager is ready to show the
new content.  This prevents the user from seeing a flash of the
old content while the screen is being turned on.  When everything is
ready, we dismiss the electron beam.

It's important for the electron beam to remain visible for
the entire duration from just before the screen is turned off until
after the screen is turned on and is ready to be seen.  This is
why we cannot fix the bug by deferring rotation or otherwise
getting in the way of the window manager doing what it needs
to do to get the screen ready when the screen is turned on again.

Bug: 7479740
Change-Id: I2fcf35114ad9b2e00fdfc67793be6df62c8dc4c3
2012-12-04 14:40:23 -08:00
Daniel Sandler
526fa0e6d5 PRIORITY_MIN notifications should be truly ambient.
If your notification is set to MIN priority, it will never
attempt to interrupt the user, either by an icon (already
implemented), or (new in this patch) by LED, vibration, or
sound.

Bug: 7648785
Change-Id: Ia0f8e010e62029d8d8ef1955dd20b7c79fb68398
2012-12-04 17:01:12 -05:00
John Spurlock
33669f35e4 Merge "Kill dreams that do not create a timely service connection." into jb-mr1.1-dev 2012-12-04 13:45:50 -08:00
John Spurlock
006f567c21 Kill dreams that do not create a timely service connection.
Implement a timeout between when the dream binds and
when the dream creates the service connection.  If
the connection is not created within a certain amount of
time, stop the dream.

This fixes the current bug where a dream that crashes in
onCreate (or the ctor) can put the dream controller in a
bad state until the screen is turned off.

The timeout is equal to the service restart delay in
activity manager (ActiveServices) to avoid restarting
(and recrashing).

Bug:7596707
Change-Id: I3e11efc6af0b79ec4cb0fbc94e4e109c7602ddac
2012-12-04 15:10:04 -05:00
Victoria Lease
39ec1ec187 Merge "Fix Wrong parameter in HashMap.remove" 2012-12-04 11:56:04 -08:00
Matthew Xie
1ef98fb37e am 5cb09b7d: am 8b283df9: am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev
* commit '5cb09b7dc5b2a3bfa895bca5402af9edc8ec9d9a':
  Change getName and getAddress permission to BLUETOOTH
2012-12-04 11:29:53 -08:00
Matthew Xie
5cb09b7dc5 am 8b283df9: am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev
* commit '8b283df989f9b8b71797f9feaeb15cb012ab3190':
  Change getName and getAddress permission to BLUETOOTH
2012-12-04 11:27:11 -08:00
Matthew Xie
8b283df989 am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev
* commit 'b6b4f171ff38ccac833edb2a1ad7f725ed068d46':
  Change getName and getAddress permission to BLUETOOTH
2012-12-04 11:25:14 -08:00
Matthew Xie
af5ddbfcf5 Change getName and getAddress permission to BLUETOOTH
The permissions were set as BLUETOOTH_ADMIN by mistake. Correct them
bug 7665249

Change-Id: Ic1bdbeb25e8f55d886f9a8d38920cbb769dd38ca
2012-12-04 10:47:43 -08:00
Craig Mautner
bebd1a092e am d3b9dd6c: am 40627de3: Merge "Remove unnecessary references in WindowManagerService"
* commit 'd3b9dd6ca6325abe5cf2049c2894a86b256a3db1':
  Remove unnecessary references in WindowManagerService
2012-12-04 10:39:59 -08:00
Craig Mautner
d3b9dd6ca6 am 40627de3: Merge "Remove unnecessary references in WindowManagerService"
* commit '40627de3044c4a23c20c2229cab20aab21ff2b03':
  Remove unnecessary references in WindowManagerService
2012-12-04 10:38:32 -08:00
You Kim
a6d0b6f851 Fix Wrong parameter in HashMap.remove
Change-Id: Ibf93833697c865904f29821e5778853127e5fb00
Signed-off-by: You Kim <you.kim72@gmail.com>

Conflicts:

	services/java/com/android/server/LocationManagerService.java
2012-12-04 09:57:23 -08:00
You Kim
cb6291c9b1 Remove unnecessary references in WindowManagerService
Clean message routines in WindowManagerService.

Change-Id: I3e3106b6499c67d1fd7133c987c0452a73141a3f
Signed-off-by: You Kim <you.kim72@gmail.com>
2012-12-05 00:10:03 +09:00
satok
81f8b7c667 Fix an issue on installing 3rd-party IME by a non-primary user
Bug: 7573552

Currently IMMS doesn't receive install/uninstall messages. Accordingly enabled IMEs' list is not refreshed properly.

Change-Id: I25e9798a65f528dd270cd6bb1f14b1d887194787
2012-12-04 21:16:59 +09:00
Dianne Hackborn
f9ae5f75af am 23307cbb: am e0a676a3: Merge "Fix issue #7649590: Background windows sometimes not being hidden for secondary users" into jb-mr1.1-dev
* commit '23307cbb6b432b658b0fd7437dacfedd6298af94':
  Fix issue #7649590: Background windows sometimes not being hidden for secondary users
2012-12-03 16:08:35 -08:00
Svetoslav Ganov
2c5f782094 Merge "Refactoring of the screen magnification feature." 2012-12-03 15:59:32 -08:00
Dianne Hackborn
23307cbb6b am e0a676a3: Merge "Fix issue #7649590: Background windows sometimes not being hidden for secondary users" into jb-mr1.1-dev
* commit 'e0a676a3bb0e7b9aced9359a021e4c5d2ffef752':
  Fix issue #7649590: Background windows sometimes not being hidden for secondary users
2012-12-03 15:54:34 -08:00
Dianne Hackborn
e0a676a3bb Merge "Fix issue #7649590: Background windows sometimes not being hidden for secondary users" into jb-mr1.1-dev 2012-12-03 15:51:47 -08:00
Dianne Hackborn
bb4ca5271a Fix issue #7649590: Background windows sometimes not being hidden for secondary users
There are two things going on here:

(1) In secondary users, some times theme information such as whether
the window is full screen opaque was not being retrieved, so the window
manager didn't know that it could hide the windows behind the app.
This would just be a performance problem, except that:

(2) There appear to be a number of applications that declare that they
are full screen opaque, when in fact they are not.  Instead they are
using window surfaces with an alpha channel, and setting some pixels
in their window to a non-opaque alpha level.  This will allow you to
see whatever is behind the app.  If the system happens to completely
remove the windows behind the app, and somebody is filling the frame
buffer with black, then you will see what the app intends -- those
parts of its UI blended with black.  If one of those cases doesn't
hold (and though we have never guaranteed they would, in practice this
is generally what happens), then you will see something else.

At any rate, if nothing else than for performance reasons, we need to
fix issue #1.

It turns out what is happening here is that the AttributeCache used
by the activity manager and window manager to retreive theme and other
information about applications has not yet been updated for multi-user.

One of the things we retrieve from this is the theme information telling
the window manager whether an application's window should be treated
as full screen opaque, allowing it to hide any windows behind it.  In
the current implementation, the AttributeCache always retrieves this
information about the application as the primary user (user 0).

So, if you have an application that is installed on a secondary user but
not installed on the primary user, when the AttributeCache tries to retrieve
the requested information for it, then from the perspective of the primary user
it considers the application not installed, and is not able to retrieve that
info.

The change here makes AttributeCache multi-user aware, keeping all of its
data separately per-user, and requiring that callers now provide the user
they want to retrieve information for.  Activity manager and window manager
are updated to be able to pass in the user when needed.  This required some
fiddling of the window manager to have that information available -- in
particular it needs to be associated with the AppWindowToken.

Change-Id: I4b50b4b3a41bab9d4689e61f3584778e451343c8
2012-12-03 14:09:06 -08:00