21042 Commits

Author SHA1 Message Date
Christopher Tate
2194a796bf am b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev
* commit 'b88ba912f6bb2fd0ae16794470cce38ee308b6ea':
  Fix alarm delivery-order sorting
2014-10-03 21:02:46 +00:00
Christopher Tate
b88ba912f6 Merge "Fix alarm delivery-order sorting" into lmp-dev 2014-10-03 19:56:36 +00:00
Christopher Tate
1590f1ee7b Fix alarm delivery-order sorting
We also refine the order of delivery within any given package.  Now,
we identify which apps have wakeup alarms being delivered in the
current pass, and deliver all of that app's alarms before moving
on to alarm delivery to apps who are only receiving non-wakeup alarms
in the current delivery pass.  The TIME_TICK alarm is also hoisted to
the start of the current delivery pass if present.

Bug 17778686

Change-Id: I6306a00fe657787a77d0254c0807ac51e810fdcf
2014-10-03 12:33:35 -07:00
Robert Greenwalt
d4fb0501d9 am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev
* commit '24861eabe641d5a147f127c8e7f98fab949224ab':
  Send callbacks for Net property changes
2014-10-03 15:40:33 +00:00
Robert Greenwalt
24861eabe6 Merge "Send callbacks for Net property changes" into lmp-dev 2014-10-03 15:36:39 +00:00
John Spurlock
49709d0637 am a23867c4: Merge "Disable notification effects during phone calls." into lmp-dev
* commit 'a23867c4e8efb4cd9e86c70bff1a595da6679a82':
  Disable notification effects during phone calls.
2014-10-03 13:53:59 +00:00
John Spurlock
a23867c4e8 Merge "Disable notification effects during phone calls." into lmp-dev 2014-10-03 13:49:43 +00:00
Robert Greenwalt
a848c1cc0a Send callbacks for Net property changes
LinkProperties and NetworkCapabilities changes were not calling app callbacks.

bug:17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f
2014-10-02 21:05:44 -07:00
Paul Jensen
39f605ba88 am a11b5e34: Merge "Send updated NetworkAgent score to NetworkFactories when validated." into lmp-dev
* commit 'a11b5e34f50899a48531bb84ba3f6d796a64985e':
  Send updated NetworkAgent score to NetworkFactories when validated.
2014-10-03 02:24:29 +00:00
Paul Jensen
c2984f1389 am 6eead851: Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-dev
* commit '6eead851d2ea56c3e7319587d4066b1828d54699':
  Allow any unvalidated Network to satisfy NetworkRequests.
2014-10-03 02:24:24 +00:00
Paul Jensen
a11b5e34f5 Merge "Send updated NetworkAgent score to NetworkFactories when validated." into lmp-dev 2014-10-03 02:18:12 +00:00
Paul Jensen
6eead851d2 Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-dev 2014-10-03 02:16:44 +00:00
John Spurlock
32fe4c6e64 Disable notification effects during phone calls.
Listen for phone call state changes in NoMan, and disable
incoming non-call notification effects when non-idle.

Bug:17658454
Change-Id: I6f7d66413970fbff6822ab29a12f91cbed068261
2014-10-02 21:05:06 -04:00
Dianne Hackborn
c4b04ea425 am b591da94: Merge "Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything" into lmp-dev
* commit 'b591da942e159588c70687dfe3e792feedc8f3b4':
  Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything
2014-10-03 00:47:04 +00:00
Dianne Hackborn
b591da942e Merge "Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything" into lmp-dev 2014-10-03 00:40:26 +00:00
Dianne Hackborn
3f16dd49e8 Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything
Tweak the oom tuning to raise everything by 50%.  This is the same
increase we did for Volantis; I am thinking that most of the issue
there was not it being 64 bit, but it being tighter on RAM.  From
my testing, it looks like in user switching there was some paging
going on with Nakasi, and with this change things seem to be better.

We should probably revisit this for future work on RAM.  It seems
likely that a 64 bit device will need more RAM, so probably the value
I am picking here is larger than we actually need for other devices.
I think this is the safest change at this point though -- it leaves
Volantis the same, where we already had tweaked it to address paging
issues, raises it on Nakasi (to the same value as Volantis) where we
seem to have paging issues, and on our other devices also raises it
but those are generally not under memory pressure so this shouldn't
really make a difference.

Change-Id: Ib19394068734d322a015ed07370d9d4961877e4b
2014-10-02 17:21:27 -07:00
Jason Monk
141e7fe54e am 51900639: Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev
* commit '519006395204ba3eab77ae420d20eb70ebb78af5':
  Synchronize on all sendProxyBroadcast calls
2014-10-02 22:41:54 +00:00
Jason Monk
5190063952 Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev 2014-10-02 22:36:47 +00:00
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
Jason Monk
cf0f97a3aa Synchronize on all sendProxyBroadcast calls
To avoid race conditions.  Also make mDefaultProxy volatile for
safety.

Bug: 17697364
Change-Id: I8f0abb1a6e1c816f3addc11a69ff794ad767f2cf
2014-10-02 15:39:38 -04: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
Paul Jensen
c8b9a7428d Send updated NetworkAgent score to NetworkFactories when validated.
Previously the score was not sent out causing other NetworkFactories
to have the lower unvalidated score and to repeatedly try to bring
up a new Network only to have it torn down.
Also, avoid logging an error when tearing down a network with only
listening requests.

bug:17726566
Change-Id: I82ff7c9bd5ec962f62a50ad0042c278622953969
2014-10-02 11:06:43 -04:00
Paul Jensen
4b9b2be894 Allow any unvalidated Network to satisfy NetworkRequests.
Explicitly selected Networks may never be validated (e.g. Chromecast)
but are still given a high score so they can explicitly become the
default Network.  Without this fix they do not become the default
Network if another Network is present.  This was an artifact of how
unvalidated Networks were handled, but now that unvalidated Networks
are properly handled, ala 50807d, we can freely rematch even
unvalidated Networks and NetworkRequests.
Also, never linger and teardown unvalidated Networks as the user
might be in the process of signing in.  This better matches prior
behavior when unvalidated networks didn't match NetworkRequests,
and thus were never lingered.
Also, don't disconnect networks that may be lingering.  The
disconnect logic in rematchNetworkAndReqeuests() is adjusted to only
fire when a network is newly validated.
It is incorrect to consider rematching uncreated Networks and
explicitly selecting created Networks, so this change logs error
messages in those cases.

bug:17647968
bug:17396616
Change-Id: Id6b8a350b8200f484d5bfd14ca0a8f64f08846a0
2014-10-02 10:56:51 -04: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
Neil Fuller
ee665151a4 am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible"
* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
  Switch from FloatMath -> Math and Math.hypot where possible
2014-10-02 10:18:29 +00: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
Svetoslav
c2197ade81 am d35b072d: Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev
* commit 'd35b072dca42d249c219c886322c122739b086d7':
  Fix accessiblity introspection from the shell user regression.
2014-10-01 23:29:15 +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
Svetoslav
d35b072dca Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev 2014-10-01 23:24:47 +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