4295 Commits

Author SHA1 Message Date
Baligh Uddin
e142a1a0cd am 9cdde5f8: Merge "Fix a bug with screen brightness during screen off animation." into lmp-dev
* commit '9cdde5f8348ddd03e1d6eb2c741fb3e761ab66e9':
  Fix a bug with screen brightness during screen off animation.
2014-10-02 21:43:35 +00:00
Baligh Uddin
9cdde5f834 Merge "Fix a bug with screen brightness during screen off animation." into lmp-dev 2014-10-02 21:38:25 +00:00
Matthew Williams
785bbc6076 am 5c6756fe: Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager"
* commit '5c6756fefb6db0fe468b9d747960a6da344880ad':
  Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager"
2014-10-02 20:54:50 +00:00
Matthew Williams
5c6756fefb Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager"
This reverts commit cf2bd348e73e880fe5bfc7a025732d4ec606ff1f.

Reverted because for account removal the AccountManagerService
delegates the sending of LOGIN_ACCOUNTS_CHANGED to the authenticator.
See b/17511110.

Change-Id: Ic03016af98070b4add5f7a5ec1fdff32ba63298e
2014-10-02 20:47:59 +00:00
Jing Ji
4bcef7e339 am d5941978: Allow system app to take ownership of built-in permissions
* commit 'd594197868c4a51bb8f8bd62479999debc72bf2a':
  Allow system app to take ownership of built-in permissions
2014-10-02 20:45:30 +00:00
Jing Ji
d594197868 Allow system app to take ownership of built-in permissions
Previous commit bfed9f34c makes the preloaded system app take
precedence over third-party apps when defining permissions, but
it also makes it be able to override android built-in permissions.

Now allow preloaded system app to take the ownership of built-in
permissions instead of overriding it.

Change-Id: I10d588d0284e4316ea4be552fd6191f33e3c725b
2014-10-02 20:40:21 +00:00
Craig Mautner
eaa59b1ace am 9dfad8c7: Merge "Remove misleading error log." into lmp-dev
* commit '9dfad8c7f01e8a69989d1c44deb8a621216a0d9f':
  Remove misleading error log.
2014-10-02 20:18:34 +00:00
Craig Mautner
9dfad8c7f0 Merge "Remove misleading error log." into lmp-dev 2014-10-02 20:13:55 +00:00
Jeff Brown
bf4e414cf0 Fix a bug with screen brightness during screen off animation.
Due to a recent change there was a regression that caused the
screen brightness to be animated down to 0 while the screen
off animation was running.  When the brightness was low this
would cause the screen off animation to be cut short.

This change ensures that we take into account the actual screen
state instead of the desired screen state when making screen
brightness decisions in case we are in the middle of a transition.

The darkness came early.  The pixel fairies trembled.

Bug: 17718416
Change-Id: Ib4b55d61b359abbc70920e324f08a5db07bdd035
2014-10-02 13:11:02 -07:00
Craig Mautner
333c2ec883 Remove misleading error log.
It's perfectly ok for a secondary display to not have a home stack.
There is no reason to report it.

Related to b/17677973.

Change-Id: Ia9d52cabb601760d32d2b847dfa0ca4f304e4e2a
2014-10-02 12:24:02 -07:00
Neil Fuller
f7cf5d43aa resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp
Change-Id: I97671e62de26919e391dbb2686511584c59ab990
2014-10-02 11:48:08 +01:00
Sreeram Ramachandran
06b4f45899 am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev
* commit '5aaabc0fa66dd755843f040fe634962477107950':
  Send app permissions to netd.
2014-10-02 06:29:39 +00:00
Sreeram Ramachandran
e4a05afe85 Send app permissions to netd.
Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
2014-10-01 20:22:34 -07:00
Dianne Hackborn
e2aa87b8e2 am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
* commit 'c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a':
  More work on issue #17656716: Unhandled exception in Window Manager
2014-10-02 00:27:28 +00:00
Dianne Hackborn
c338784bf6 Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-10-02 00:23:18 +00:00
Erik Pasternak
9d96c9fa05 am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
  Implement auto-sleep functionality.
2014-10-02 00:04:16 +00:00
Erik Pasternak
4d82c46ef5 Merge "Implement auto-sleep functionality." into lmp-dev 2014-10-02 00:00:40 +00:00
Dianne Hackborn
8d05172112 More work on issue #17656716: Unhandled exception in Window Manager
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock.  This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it.  And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing.  So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
2014-10-01 16:58:56 -07:00
Dianne Hackborn
383ce6dc74 am c3e7f87b: Merge "Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev
* commit 'c3e7f87bf9930a20c37609f567f5d88305fb1ddd':
  Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build.
2014-10-01 23:33:55 +00:00
Dianne Hackborn
c3e7f87bf9 Merge "Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev 2014-10-01 23:29:49 +00:00
Dianne Hackborn
fa44e586b3 am 144508d5: Merge "Revert white space changes." into lmp-dev
* commit '144508d5da4dec37183617ec259ab83d2db4f012':
  Revert white space changes.
2014-10-01 23:29:10 +00:00
Dianne Hackborn
144508d5da Merge "Revert white space changes." into lmp-dev 2014-10-01 23:21:11 +00:00
Winson Chung
010447561a am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev
* commit '7f76e505624fddbc4ba3350f3e381ccd275a5a75':
  Fixing invalid check to get component enabled state. (Bug 17679693)
2014-10-01 23:01:36 +00:00
Winson Chung
7f76e50562 Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 2014-10-01 22:53:29 +00:00
Dianne Hackborn
9449a6162e Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build.
There was a path through idle where we could clear mBooting but not set
mBooted, so we would no longer start activities.  This is probably happening
because if you start a user or userdebug build with the device plugged in
to adb, the system early on starts the USB security dialog, before home is
started.  If that goes idle first, we will end up in the case where we
clear booting (because something went idle) but not set booted (because it
was not home that went idle).

Change this so that we always set booted when clearing booting.

Change-Id: I40053710eefa939315aeb9475ecdd2e8a87351ff
2014-10-01 15:53:28 -07:00
Craig Mautner
6f357112f8 am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev
* commit '245645ca460150b4030d84c88faa931345a90a50':
  Don't clear visible-behind activity if it is top
2014-10-01 22:36:47 +00:00
John Spurlock
8994f2eb44 am c909e1b2: Zen: Fix new event category check.
* commit 'c909e1b2dfa2e47b786d96818f70f6308c5a78be':
  Zen: Fix new event category check.
2014-10-01 22:35:59 +00:00
Brian Carlstrom
753f08f740 am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev
* commit '7123bd690fa14d0b9e33f5a70c58ea5b5f1b7d32':
  Use VMRuntime.isBootClassPathOnDisk
2014-10-01 22:35:11 +00:00
Jeff Brown
c75d2ce970 am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev
* commit '62434d6a4b4b5aa7d44aa4344b5cb0f82df2b923':
  Reduce latency from doze to screen on.
2014-10-01 22:34:44 +00:00
Wink Saville
d1ac9bd2bd Merge commit '62321ab1' into fix-merge-conflict-lmp-dev-plus-aosp
* commit '62321ab1':
  Maybe fix issue #17700474: manta: high occurrence of device booted...

Conflicts:
	services/core/java/com/android/server/am/ActivityManagerService.java

Change-Id: I7d472115d83a3dde326f991c245b2c6fed29e00c
2014-10-01 15:29:55 -07:00
Dianne Hackborn
01945f240a Revert white space changes.
Change-Id: I3bc9995adf5cefd91f5a9fd4d2a701056dba3ca9
2014-10-01 15:14:28 -07:00
Winson Chung
dcf21d1545 Fixing invalid check to get component enabled state. (Bug 17679693)
Change-Id: I225d59bf766122d667d990d7e5b1971c6e8af2aa
2014-10-01 15:04:16 -07:00
Jeff Brown
05af6adb8d Implement auto-sleep functionality.
Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity.  By default this
value is set to -1 which maintains today's existing behavior.

We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM.  When the sleep timeout expires, the state is cleared and
the dream ends.

Bug: 17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
2014-10-01 15:01:10 -07:00
Craig Mautner
245645ca46 Merge "Don't clear visible-behind activity if it is top" into lmp-dev 2014-10-01 17:48:14 +00:00
Craig Mautner
64ccb70867 Don't clear visible-behind activity if it is top
Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.

This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.

Fixes bug 17648436.

Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
2014-10-01 10:14:53 -07:00
John Spurlock
c909e1b2df Zen: Fix new event category check.
Allow events through if configured, and use a switch
for separating mode-specific logic.

Bug:17580878
Change-Id: Id7b5d8b50173015d6a78568ed0a90e0bccf98549
2014-10-01 11:17:43 -04:00
Brian Carlstrom
7123bd690f Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 2014-10-01 04:21:26 +00:00
Jeff Brown
62434d6a4b Merge "Reduce latency from doze to screen on." into lmp-dev 2014-10-01 02:31:30 +00:00
Dianne Hackborn
62321ab114 Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 2014-10-01 01:16:15 +00:00
Dianne Hackborn
7622a0f8e4 Maybe fix issue #17700474: manta: high occurrence of device booted...
...but dev.bootcomplete flag is not set

Rework things to address a few issues I found:

- When the activity goes idle, the way we were handling finishing the
  boot there was calling finishBooting() with the lock held, but it
  shouldn't.  We now dispatch that and turning on the screen together
  in a separate message.

- Make sure we don't try to start the home activity until we have
  reached the point of the system being ready and mBooting being set.
  This ensures we don't do any work prematurely.

Change-Id: If30c1f287af73bc2164e7aadbe98022ae42cc5e7
2014-09-30 18:05:18 -07:00
Jeff Brown
0a434776b8 Reduce latency from doze to screen on.
Don't wait for the brightness ramp to complete before reporting
display ready.  Keep track of whether we have any unfinished
brightness changes and take care to grab a wakelock to ensure
they are eventually applied.

Ideally we would rewrite the whole state machine to more carefully
coordinate screen state and brightness changes but that's too
risky for now.

The pixel fairies are having a bad day.

Bug: 17718416

(cherry picked from commit 875f80c2732a3fbe652a6e8fc14031041f791308)

Change-Id: I7a2d8ba4591a12b773653d3dbf86c7db016f967e
2014-09-30 18:00:40 -07:00
Brian Carlstrom
a39871ef5e Use VMRuntime.isBootClassPathOnDisk
Bug: 17679443
Change-Id: If53c236058a7237d735c2344a715cf0a36301f9b
2014-09-30 16:49:32 -07:00
Andreas Gampe
8dcf593f90 resolved conflicts for merge of 6290c048 to lmp-dev-plus-aosp
Change-Id: I9fd4b4402f301c3521f57b207793ab4dfdd67a12
2014-09-30 16:41:59 -07:00
Winson Chung
c23f8812ac am 86ef70eb: Fixing build (Bug 17381033)
* commit '86ef70eb08b83fc41d0c8e124315d9ee9fea0ee4':
  Fixing build (Bug 17381033)
2014-09-30 23:30:11 +00:00
Winson Chung
86ef70eb08 Fixing build (Bug 17381033)
Change-Id: I95a7c8167f82a4fe982bdc9588d5fbaf5a627d0b
2014-09-30 16:17:12 -07:00
Winson Chung
5fc6c2b923 am c12f5745: Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev
* commit 'c12f57457411e67adf2c8acaad21b08c934e583b':
  Fixing an issue with leaking starting windows. (Bug 17657878)
2014-09-30 22:51:39 +00:00
Craig Mautner
ecb67808f3 am 4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev
* commit '4fb4163f4c6f49eebc34d1b193c526558af0d375':
  Call Surface.release() for starting windows
2014-09-30 22:51:35 +00:00
Winson Chung
c12f574574 Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev 2014-09-30 22:48:43 +00:00
Craig Mautner
4fb4163f4c Merge "Call Surface.release() for starting windows" into lmp-dev 2014-09-30 22:47:05 +00:00
Winson Chung
c11b19caef Fixing an issue with leaking starting windows. (Bug 17657878)
In some cases, when starting an animation while another starting window is visible,
the starting window is never scheduled to be removed.  In that case, we try and
schedule the closing app starting window to be removed when we are starting the
transition to a new activity.  This also partially addresses issues related to
leaking windows in b/17381033.

Change-Id: Id26525cd71380852f109ec2f55a4a60db5086ded
2014-09-30 22:21:26 +00:00