Commit Graph

38496 Commits

Author SHA1 Message Date
Wale Ogunwale
e87b575046 Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev am: 5d6a218d9e am: d9125edb98
am: 94d93dd38f

* commit '94d93dd38fbab0ff8f9a9ce397a522cf2fcd6429':
  Dismiss docked stack if an activity is shown on top of the lock screen

Change-Id: Iaaf1dc4cd6f4008bf4bc571bb70365d431ea30ed
2016-05-06 18:54:56 +00:00
Wale Ogunwale
94d93dd38f Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev am: 5d6a218d9e
am: d9125edb98

* commit 'd9125edb98034562b5269a7cd97cc6bcac7a3238':
  Dismiss docked stack if an activity is shown on top of the lock screen

Change-Id: I0b0130142296468e43fdb106d214f43a8fc500e5
2016-05-06 18:47:17 +00:00
Wale Ogunwale
d9125edb98 Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev
am: 5d6a218d9e

* commit '5d6a218d9e0d21367f6365d4de51532ca7e14dc9':
  Dismiss docked stack if an activity is shown on top of the lock screen

Change-Id: I4bf1ef48aef928e12d7dbb9faa6c4e0d489acadb
2016-05-06 18:42:09 +00:00
TreeHugger Robot
5d6a218d9e Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev 2016-05-06 18:30:23 +00:00
Jorim Jaggi
1db8593046 Merge "Don\'t crash the system when detecting a transient wrong state am: f970410afe am: ec88030fb9" into nyc-mr1-dev-plus-aosp
am: 774958f0e1

* commit '774958f0e1bb90a5591f7b6cbe4fab823e1cd687':
  Don't crash the system when detecting a transient wrong state

Change-Id: I1b6604a78fdaf332da8524b38e29118906443a6d
2016-05-06 17:41:55 +00:00
Wale Ogunwale
ad0f544c94 Merge "Fixed bad focus stack state when focused docked stack is removed" into nyc-dev am: 316f67bcfb am: 03507ebdd5
am: cd2db2cda5

* commit 'cd2db2cda57393db7616e0dd777e3a5f5bc085d0':
  Fixed bad focus stack state when focused docked stack is removed

Change-Id: I1bf61d2b934ccbfb927d2eab1bd8580ac53d7c0b
2016-05-06 17:36:15 +00:00
Jorim Jaggi
4da4366dd3 Don\'t crash the system when detecting a transient wrong state am: f970410afe
am: ec88030fb9

* commit 'ec88030fb96b02dd72305d158c2783808b47b7da':
  Don't crash the system when detecting a transient wrong state

Change-Id: Iefbc26be15dc67bc19ab61a388e8eb1d649ca28c
2016-05-06 17:34:03 +00:00
Jorim Jaggi
35ad9d867e Don\'t crash the system when detecting a transient wrong state
am: f970410afe

* commit 'f970410afef518003c84eef022194848b2a4f606':
  Don't crash the system when detecting a transient wrong state

Change-Id: Ic66745a59761e34b9b5e37651ee3cf4c0022b26e
2016-05-06 17:30:55 +00:00
Jorim Jaggi
ec88030fb9 Don\'t crash the system when detecting a transient wrong state
am: f970410afe

* commit 'f970410afef518003c84eef022194848b2a4f606':
  Don't crash the system when detecting a transient wrong state

Change-Id: Ied0b4700c9c96a7ce04cce20f5da0ca62d5a1a72
2016-05-06 17:30:49 +00:00
Wale Ogunwale
cd2db2cda5 Merge "Fixed bad focus stack state when focused docked stack is removed" into nyc-dev am: 316f67bcfb
am: 03507ebdd5

* commit '03507ebdd527a945cc3e7fddb2d8a49c8b4df334':
  Fixed bad focus stack state when focused docked stack is removed

Change-Id: I69cad505334d9e9a0164700da84099f80ef8242f
2016-05-06 17:30:47 +00:00
Wale Ogunwale
03507ebdd5 Merge "Fixed bad focus stack state when focused docked stack is removed" into nyc-dev
am: 316f67bcfb

* commit '316f67bcfbc8b57a115a83d3484b8edde972570b':
  Fixed bad focus stack state when focused docked stack is removed

Change-Id: I4060b57b8e6f55ee20a9536a90fea2d0901043b1
2016-05-06 17:25:47 +00:00
Wale Ogunwale
2079e7c7f6 Merge "Fixed bad focus stack state when focused docked stack is removed" into nyc-dev
am: 316f67bcfb

* commit '316f67bcfbc8b57a115a83d3484b8edde972570b':
  Fixed bad focus stack state when focused docked stack is removed

Change-Id: I8870b4927852b9b577116875a2b9f946a15f2513
2016-05-06 17:25:43 +00:00
Jorim Jaggi
f970410afe Don't crash the system when detecting a transient wrong state
Bug: 28616824
Change-Id: I124f7196d709c33fe70137541b650788af83b3b3
2016-05-06 17:21:36 +00:00
Wale Ogunwale
9973294080 Dismiss docked stack if an activity is shown on top of the lock screen
It is risky/complicated to try to put the activity showing on-top of
the lock screen in the right fullscreen configuration with the current
architecture. So, we just dismiss for now.

Bug: 28195260
Change-Id: I29a0350993ce8fe548d4a465b06d877cde151c78
2016-05-06 10:13:14 -07:00
TreeHugger Robot
70c3000a31 Merge "Remove unused method from NetworkManagementService" 2016-05-06 15:57:52 +00:00
Wale Ogunwale
ed811d731d Fixed bad focus stack state when focused docked stack is removed
ag/990438 allowed for stack focus not to be adjusted when the currently
focused stack is removed since the caller will be moving the focus to
the right stack next. This was incorrectly enabled for the positionTask
call were the stack will not be moved to the front since the functionality
is used to move task within stacks we don't want to gain focus.

Bug: 28616824
Change-Id: Ia6aea17c0335d036a17b83fed28799428ca58eda
2016-05-06 08:41:19 -07:00
Vincent Palatin
788d2c449e Merge "Merge "Fix notifications for USB PD enabled devices" into nyc-mr1-dev am: a57386b49e" into nyc-mr1-dev-plus-aosp
am: dc80d82e9b

* commit 'dc80d82e9bcfbec76b8aa489561cd88bf218752c':
  Fix notifications for USB PD enabled devices

Change-Id: I54ac425e182781b6aee656b1f6b9f40a119b34f5
2016-05-06 15:29:53 +00:00
Vincent Palatin
64f2e171a0 Merge "Fix notifications for USB PD enabled devices" into nyc-mr1-dev
am: a57386b49e

* commit 'a57386b49e7ba9c0aa680b315343df2ba5fe6389':
  Fix notifications for USB PD enabled devices

Change-Id: Iefcec842205c953c379d2007d455d1ad611c8708
2016-05-06 15:24:18 +00:00
Puneet Kumar
a57386b49e Merge "Fix notifications for USB PD enabled devices" into nyc-mr1-dev 2016-05-06 15:17:37 +00:00
David Brazdil
e264d1aa89 Hide \'Optimizing apps\' dialog if not M->N upgrade am: ee057752cc am: 5a5cf7cd73
am: 351929565b

* commit '351929565b1dc6182984dd074f48251672caceb9':
  Hide 'Optimizing apps' dialog if not M->N upgrade

Change-Id: I5f3b9f28661aff3c97b41e9be7404aefb5254215
2016-05-06 14:14:20 +00:00
David Brazdil
351929565b Hide \'Optimizing apps\' dialog if not M->N upgrade am: ee057752cc
am: 5a5cf7cd73

* commit '5a5cf7cd7354a5c8eaa247994e163900a30c29a9':
  Hide 'Optimizing apps' dialog if not M->N upgrade

Change-Id: I70c93c6ff227116dc2a53b4719224503ff127e58
2016-05-06 14:09:24 +00:00
David Brazdil
8c0b791721 Hide \'Optimizing apps\' dialog if not M->N upgrade
am: ee057752cc

* commit 'ee057752cce759520e3ba7a022f8616504c12fa0':
  Hide 'Optimizing apps' dialog if not M->N upgrade

Change-Id: I63e8184e42851a40ccb8d0df837dc96bf85eb8c5
2016-05-06 14:04:32 +00:00
David Brazdil
5a5cf7cd73 Hide \'Optimizing apps\' dialog if not M->N upgrade
am: ee057752cc

* commit 'ee057752cce759520e3ba7a022f8616504c12fa0':
  Hide 'Optimizing apps' dialog if not M->N upgrade

Change-Id: Iea4806b0b8f473bd35e81beca653bba87deb3e24
2016-05-06 14:04:31 +00:00
David Brazdil
ee057752cc Hide 'Optimizing apps' dialog if not M->N upgrade
Recent changes reduced the amount of time spent optimizing apps at
post-OTA boot. Instead of briefly showing the 'Optimizing apps'
dialog, we hide it completely.

The dialog is still shown for OTAs from a pre-N version of Android
since they can take a non-negligible amount of time (still much less
than in M).

Bug: 27350503
Change-Id: I5f6dae0c69799e1fc522f36453d2671b333bef0e
2016-05-06 14:49:58 +01:00
Wale Ogunwale
1ac8f6bc69 Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev am: 3a94ec5617 am: f8c77eee6d
am: 99a4f256fc

* commit '99a4f256fca3e0f40784229fcdfdebba718e4bc4':
  Fixed deadlock between AM and WM when animating pinned stack.

Change-Id: Icdfecbe863df3b91e42e16c6275302c2526b1a5a
2016-05-06 02:01:28 +00:00
Wale Ogunwale
99a4f256fc Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev am: 3a94ec5617
am: f8c77eee6d

* commit 'f8c77eee6da6857673882177955a98af6c1164b9':
  Fixed deadlock between AM and WM when animating pinned stack.

Change-Id: Ied4dc91a5f36ed2a480470925b3f60145ad8ac29
2016-05-06 01:56:26 +00:00
Wale Ogunwale
97c1a72c3c Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev
am: 3a94ec5617

* commit '3a94ec56173170306b2304c858dbbeb99c3c93cc':
  Fixed deadlock between AM and WM when animating pinned stack.

Change-Id: I51938073894ec18042a987645a424811213061ad
2016-05-06 01:51:47 +00:00
Wale Ogunwale
f8c77eee6d Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev
am: 3a94ec5617

* commit '3a94ec56173170306b2304c858dbbeb99c3c93cc':
  Fixed deadlock between AM and WM when animating pinned stack.

Change-Id: Ie5f929b7a27f8fd3fc7f25b55066d8e45f97a444
2016-05-06 01:51:43 +00:00
TreeHugger Robot
3a94ec5617 Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev 2016-05-06 01:43:31 +00:00
Wale Ogunwale
2ba712905f Fixed deadlock between AM and WM when animating pinned stack.
In Ie18cc04ceeabd94093017f79676253e1189f5249 we delay ending the
pinned stack animation until app transition is done. However, the
signal that app transition is done comes in with the window manager
lock held and the we call into AM to do some additional work which
requires AM lock to be aquired. Since AM depends on WM we shouldn't
be holding the WM lock while calling into AM since AM can call into
WM with its lock held. We now post a runnable to finish the pinned
stack animation without the WM lock held.

Bug: 28564514
Change-Id: I8450123e992e569a74609883de810cdc611ced81
2016-05-05 16:47:45 -07:00
Christopher Wiley
2103e78e0c Remove unused method from NetworkManagementService
Bug: 28598325
Test: Builds

Change-Id: I6a226b3410cda4e12a9225741ec81cd12b48892f
2016-05-05 16:43:43 -07:00
Joe Onorato
6add64cd59 Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90b4 am: 67af8a12ae
am: 068061ff06

* commit '068061ff061a7f5ea6196fd5a3b428cbd4d40872':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: I11555166cc09298c0d6d7fa131b57875ca024a65
2016-05-05 22:32:10 +00:00
Joe Onorato
068061ff06 Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90b4
am: 67af8a12ae

* commit '67af8a12ae20444f108f75c077b12821af52c909':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: Ia87d4db58bbdf4695b280edf6b6a79ad5425eea7
2016-05-05 22:27:01 +00:00
Joe Onorato
67af8a12ae Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev
am: 47384f90b4

* commit '47384f90b4adb6dc4a005a7870e0ec6841042151':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: I0bfd7f8967e828500fbae93673ec2bbf31d42b1c
2016-05-05 22:22:02 +00:00
Joe Onorato
cad814b9bf Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev
am: 47384f90b4

* commit '47384f90b4adb6dc4a005a7870e0ec6841042151':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: I86640737d6f188b6b00901937d498ce1148ec10f
2016-05-05 22:21:49 +00:00
Amith Yamasani
f6712d0377 Merge "Merge "Fix a regression in registering for package_removed" into nyc-dev am: 7be089b74e am: b8b157b694" into nyc-mr1-dev-plus-aosp
am: f33b05d9ea

* commit 'f33b05d9eaf4f3582d3fa8503e55f3f009617199':
  Fix a regression in registering for package_removed

Change-Id: I6df71070da50b47859af00bd7fc356e2cca8d215
2016-05-05 22:12:20 +00:00
Dianne Hackborn
906bf903b4 Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev am: d90be6cccc am: 9071cacdbe
am: 9b560795e2

* commit '9b560795e292a9701848e0b0603c7edc68b8bc1d':
  Fix issue #28602068: Add count to job scheduler stats

Change-Id: If3d2f01c1e0aacdcf7ef44eeef46ea84dbfb3b32
2016-05-05 22:12:08 +00:00
Joe Onorato
47384f90b4 Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev 2016-05-05 22:11:57 +00:00
Amith Yamasani
8f9c6e47f1 Merge "Fix a regression in registering for package_removed" into nyc-dev am: 7be089b74e
am: b8b157b694

* commit 'b8b157b6943e2156c172990d189fd208718b25aa':
  Fix a regression in registering for package_removed

Change-Id: Ic526b3a0eafa24f93db98cc02d77d29b9cd94b87
2016-05-05 22:07:02 +00:00
Dianne Hackborn
9b560795e2 Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev am: d90be6cccc
am: 9071cacdbe

* commit '9071cacdbe6896e332994b3c2948ffb93019938a':
  Fix issue #28602068: Add count to job scheduler stats

Change-Id: If21e0b4af5f22d989df64e9785ea28fc24e89fd8
2016-05-05 22:06:58 +00:00
Amith Yamasani
b8b157b694 Merge "Fix a regression in registering for package_removed" into nyc-dev
am: 7be089b74e

* commit '7be089b74e4c8be473caa6fc2c2b0268c5e9d83c':
  Fix a regression in registering for package_removed

Change-Id: Ibe5dcb2435a134c52eada26b0cb1fffe9d710dde
2016-05-05 22:02:26 +00:00
Dianne Hackborn
9071cacdbe Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev
am: d90be6cccc

* commit 'd90be6cccca683e34566f5550ebb34f1c8e75b69':
  Fix issue #28602068: Add count to job scheduler stats

Change-Id: I2671260e69f3a3b07fd183fa97c274bea7520aca
2016-05-05 22:02:22 +00:00
Amith Yamasani
e8f013fcdd Merge "Fix a regression in registering for package_removed" into nyc-dev
am: 7be089b74e

* commit '7be089b74e4c8be473caa6fc2c2b0268c5e9d83c':
  Fix a regression in registering for package_removed

Change-Id: Ic98eeddf9b1754b444a11531b2f762614751b111
2016-05-05 22:02:20 +00:00
Dianne Hackborn
1f1291cbe3 Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev
am: d90be6cccc

* commit 'd90be6cccca683e34566f5550ebb34f1c8e75b69':
  Fix issue #28602068: Add count to job scheduler stats

Change-Id: I60628c4c2150b51b34ad192bbca29bfd420e4b2f
2016-05-05 22:02:18 +00:00
TreeHugger Robot
7be089b74e Merge "Fix a regression in registering for package_removed" into nyc-dev 2016-05-05 21:54:18 +00:00
Joe Onorato
1476d32b87 Add the individual wakeup alarm counts to the batterystats checkin.
Bug: 28601365
Change-Id: I94ad69eeb575f75d62bd45076184f521bd11052d
2016-05-05 14:53:25 -07:00
Dianne Hackborn
d90be6cccc Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev 2016-05-05 21:53:23 +00:00
Robert Carr
4d1cd18333 Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79 am: b9d2502eac
am: 45c6eb2164

* commit '45c6eb21648f9977057471d1f41beb275512a449':
  Prepare to replace windows across recreate().

Change-Id: I08c6f599d36fabb4f52ba23e9794c28203cc65b5
2016-05-05 19:57:27 +00:00
Christopher Tate
d094638f6e Merge "Ensure that the stream feeder doesn\'t hang in write..." into nyc-dev am: e2cdb20cf8 am: ea249fd990
am: a6205b69d7

* commit 'a6205b69d7d850eed0bcbae8cfa5204d7207f6fe':
  Ensure that the stream feeder doesn't hang in write...

Change-Id: Ifa0f7dbf0435a1d58f139a221c8dae336a2d7031
2016-05-05 19:57:19 +00:00
Robert Carr
45c6eb2164 Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79
am: b9d2502eac

* commit 'b9d2502eac428ee8021bcfa43977479032a88bfc':
  Prepare to replace windows across recreate().

Change-Id: Ia144fd6e15340d062d659903548e48121c43f8c4
2016-05-05 19:52:27 +00:00