Commit Graph

15531 Commits

Author SHA1 Message Date
Jae Seo
35e41618c8 Merge "Fix regression from "PIP: Fix NPE when onboarding is shown"" into nyc-dev am: 73522651e2
am: cb1b73c84d

* commit 'cb1b73c84d9fc52670aaf27617befd02abbd5c31':
  Fix regression from "PIP: Fix NPE when onboarding is shown"

Change-Id: Ib4db2e0ed4cb21f4632c3b8c0f0d2c7486fd9791
2016-05-14 01:14:37 +00:00
Jae Seo
cb1b73c84d Merge "Fix regression from "PIP: Fix NPE when onboarding is shown"" into nyc-dev
am: 73522651e2

* commit '73522651e2dd4085bd7f5c568dd9775f3643fb9a':
  Fix regression from "PIP: Fix NPE when onboarding is shown"

Change-Id: Ieaa81a4f0065ea53e8d248d8ce05c0c9c41a6419
2016-05-14 01:12:12 +00:00
Jae Seo
7ac2689239 Fix regression from "PIP: Fix NPE when onboarding is shown"
Removed the second "continue" to allow isFirstValidTask to be set to
false.
This is a follow-up fix from commit 91c5066c00.

Bug: 28754669
Change-Id: Ic852afaa78fc79bcd85b04e888975cd3bfc72094
2016-05-13 16:33:43 -07:00
Jorim Jaggi
d9558cbfcf Merge "Also freeze configuration when freezing bounds" into nyc-dev am: 7f303bced8
am: 3e96d18285

* commit '3e96d18285ae64dc66d256cd8bafa8f1d0bcdebe':
  Also freeze configuration when freezing bounds

Change-Id: I55ea86df1528e4f605a2bd37c4e8fece920bf665
2016-05-13 23:26:29 +00:00
Jorim Jaggi
3e96d18285 Merge "Also freeze configuration when freezing bounds" into nyc-dev
am: 7f303bced8

* commit '7f303bced8b7c1fe7f8e7f93de07106c5c610503':
  Also freeze configuration when freezing bounds

Change-Id: I95ccf9a1ca28d0f90c3fc17bc604e2cc667787d3
2016-05-13 23:23:42 +00:00
Jorim Jaggi
26c8c42bbb Also freeze configuration when freezing bounds
We also need to freeze the override configuration so we don't report
the new configuration too early, which leads to bugs.

Bug: 27915587
Change-Id: Idffadbb02ab0311796caa760ae1f467fd2d17768
2016-05-13 16:00:50 -07:00
Jorim Jaggi
5a9f4bcadf Merge "Fix transition for forced resizable exit" into nyc-dev am: 6cb8a2cfd2
am: 413c1828c8

* commit '413c1828c82266b5fc097e68cf3f99a8457cc8e0':
  Fix transition for forced resizable exit

Change-Id: Iac7ef19e32fec041aabd6e8b0524cb6a88539e0f
2016-05-13 21:32:17 +00:00
Sid Soundararajan
c7c7221ff6 Merge "Remove task based on object rather than position" into nyc-dev am: e1293b7d07
am: a02fbe1ea0

* commit 'a02fbe1ea00a9b6a5df5bd965be74ada7e496c8a':
  Remove task based on object rather than position

Change-Id: I15abbf1a5877272ef71b0a08f21d249239f5981b
2016-05-13 21:32:15 +00:00
Jorim Jaggi
413c1828c8 Merge "Fix transition for forced resizable exit" into nyc-dev
am: 6cb8a2cfd2

* commit '6cb8a2cfd2060301942b2a71f22ef62e9f39ffca':
  Fix transition for forced resizable exit

Change-Id: Ifcfee88a136d777aa3b87873fbe55cf7e587a30e
2016-05-13 21:27:01 +00:00
Sid Soundararajan
a02fbe1ea0 Merge "Remove task based on object rather than position" into nyc-dev
am: e1293b7d07

* commit 'e1293b7d07f5854337fef35a2e3b4338df90866e':
  Remove task based on object rather than position

Change-Id: I74d2dec60c6e7173d818d92ac166143a6b292f40
2016-05-13 21:26:57 +00:00
Jorim Jaggi
6cb8a2cfd2 Merge "Fix transition for forced resizable exit" into nyc-dev 2016-05-13 21:22:02 +00:00
Sid Soundararajan
e1293b7d07 Merge "Remove task based on object rather than position" into nyc-dev 2016-05-13 21:19:24 +00:00
Jorim Jaggi
e6d157b936 Fix transition for forced resizable exit
Since the transition is picked from layout params from the activity
below, we need to manually override it.

Bug: 28750938
Change-Id: I7351c7d8bd14a393cba51d6afb1e644204217440
2016-05-13 21:18:52 +00:00
Felipe Leme
6e12f9d36d Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: 25018d41f4
am: cc02a95cbd

* commit 'cc02a95cbd694927cd70d7b0d7921d3f10300b38':
  Fixed connectivity state in some power saving scenarios.

Change-Id: I9ce60e8520c041e1345960a51394f8477c4ac49e
2016-05-13 17:26:29 +00:00
Felipe Leme
e90dee0077 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev
am: 25018d41f4

* commit '25018d41f482fe21a45eb2e739f22dc7cc937428':
  Fixed connectivity state in some power saving scenarios.

Change-Id: I7ebe3864657d2147034ffae400312e94deb5ef35
2016-05-13 17:23:24 +00:00
Felipe Leme
cc02a95cbd Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev
am: 25018d41f4

* commit '25018d41f482fe21a45eb2e739f22dc7cc937428':
  Fixed connectivity state in some power saving scenarios.

Change-Id: If76cc55916bbd7e5e4093b39ff81a40c1e43034c
2016-05-13 17:23:19 +00:00
TreeHugger Robot
25018d41f4 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev 2016-05-13 17:14:13 +00:00
Jaewan Kim
4c349870d9 Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev am: abe26c8d69
am: 1f1fd18f8f

* commit '1f1fd18f8f042ccafdb10867eeb7c4b95853d2a4':
  PIP: Fix NPE when onboarding is shown

Change-Id: I27b871d4104a9e4717b190494108032ffa79b229
2016-05-13 17:03:31 +00:00
Jaewan Kim
1f1fd18f8f Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev
am: abe26c8d69

* commit 'abe26c8d69d7bfa5400e52ad4bb96020df0cdf68':
  PIP: Fix NPE when onboarding is shown

Change-Id: I53f212597a04444fd544342adb9ee60f281fffee
2016-05-13 17:00:15 +00:00
Jaewan Kim
7539af45cb Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev
am: abe26c8d69

* commit 'abe26c8d69d7bfa5400e52ad4bb96020df0cdf68':
  PIP: Fix NPE when onboarding is shown

Change-Id: I3082c08a64f423b1fa9435a473b4f398e1350856
2016-05-13 17:00:14 +00:00
Jaewan Kim
91c5066c00 PIP: Fix NPE when onboarding is shown
Bug: 28754669
Change-Id: Ifca78e111b63422c3875dc4eba48c02e11f83530
2016-05-13 16:18:49 +09:00
Winson Chung
cbf7816853 Merge "Workaround for empty recents, defer the enter animation." into nyc-dev am: 2b8dcdeda4
am: 0fcf5474c8

* commit '0fcf5474c87efec3e6b0ead4c10080605b64c9f8':
  Workaround for empty recents, defer the enter animation.

Change-Id: Iec9ac720e5d41094ec22d337faa8ea9c0313dcfc
2016-05-12 23:38:42 +00:00
Winson Chung
8d75a598bc Merge "Fixing flashing when animation the launch task." into nyc-dev am: 723bca4f58
am: fc520dd6f0

* commit 'fc520dd6f01cc175464aa35364d1a7bb2e3080c8':
  Fixing flashing when animation the launch task.

Change-Id: Ia8b2f646cf6fca63fe2471d6b2e26b0c1e021d6c
2016-05-12 23:38:39 +00:00
Winson Chung
4fc87b1dbb Merge "Fixing issue with excluded task showing when docking." into nyc-dev am: caedd41a6a
am: 60ad651c84

* commit '60ad651c8431aaeeb72bfdfe378542727a9b848f':
  Fixing issue with excluded task showing when docking.

Change-Id: Icb2c715d0ced2101c064e62f38b5108bd1da5163
2016-05-12 23:38:35 +00:00
Winson
0fcf5474c8 Merge "Workaround for empty recents, defer the enter animation." into nyc-dev
am: 2b8dcdeda4

* commit '2b8dcdeda484c3ed92969420a19ba48c2f877c81':
  Workaround for empty recents, defer the enter animation.

Change-Id: I9678058e4fdb7b207b9c9b0a2f1c2b40d47b8835
2016-05-12 23:33:38 +00:00
Winson
fc520dd6f0 Merge "Fixing flashing when animation the launch task." into nyc-dev
am: 723bca4f58

* commit '723bca4f58ec37fcf7dd4588835bb58f7c88857d':
  Fixing flashing when animation the launch task.

Change-Id: I40fe7742d043640f4b6cb516352a96f0bf71281e
2016-05-12 23:33:36 +00:00
Winson
60ad651c84 Merge "Fixing issue with excluded task showing when docking." into nyc-dev
am: caedd41a6a

* commit 'caedd41a6ab0f5aa3f6e289311162fd2c817926c':
  Fixing issue with excluded task showing when docking.

Change-Id: I58f58c02159442ccf0ffb53a4f04f585d59783bf
2016-05-12 23:33:31 +00:00
Winson
b781537aa1 Merge "Workaround for empty recents, defer the enter animation." into nyc-dev
am: 2b8dcdeda4

* commit '2b8dcdeda484c3ed92969420a19ba48c2f877c81':
  Workaround for empty recents, defer the enter animation.

Change-Id: Ie4b9c468c4b42a42cbbf0eb9892f074f771c6ea0
2016-05-12 23:33:30 +00:00
Winson
c427e27269 Merge "Fixing flashing when animation the launch task." into nyc-dev
am: 723bca4f58

* commit '723bca4f58ec37fcf7dd4588835bb58f7c88857d':
  Fixing flashing when animation the launch task.

Change-Id: Ie0bc44ef777a313f653d922adb22450c7d17e63c
2016-05-12 23:33:27 +00:00
Winson
0232243b0d Merge "Fixing issue with excluded task showing when docking." into nyc-dev
am: caedd41a6a

* commit 'caedd41a6ab0f5aa3f6e289311162fd2c817926c':
  Fixing issue with excluded task showing when docking.

Change-Id: I818763a9d8d5c4b0cb2e3836f2bee70f6266abb2
2016-05-12 23:33:24 +00:00
Winson Chung
2b8dcdeda4 Merge "Workaround for empty recents, defer the enter animation." into nyc-dev 2016-05-12 23:23:15 +00:00
Winson Chung
723bca4f58 Merge "Fixing flashing when animation the launch task." into nyc-dev 2016-05-12 23:23:07 +00:00
Winson Chung
caedd41a6a Merge "Fixing issue with excluded task showing when docking." into nyc-dev 2016-05-12 23:22:55 +00:00
Sid Soundararajan
060fcd3f86 Remove task based on object rather than position
Is some cases, the adapter is changed before the AnimationListener is
fired. Thus we need to remove the task without relying on position.

BUG: 28703989
Change-Id: If5cfe8589bbf6938c6e57e8e4c7bd54de6e3bd68
2016-05-12 15:39:42 -07:00
Adrian Roos
d5bd2b647c Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b
am: f46fdf877e

* commit 'f46fdf877ef54adc236698635967ff79d7a0dfe2':
  DPM control for remote input when locked

Change-Id: I7eb3cdf17b4a61865bfe85ae6d9c281b113aeb9f
2016-05-12 21:01:32 +00:00
Adrian Roos
a4f8525fdc Merge "DPM control for remote input when locked" into nyc-dev
am: 11c8f5315b

* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
  DPM control for remote input when locked

Change-Id: Id7074ffdc541d53d4607652cefc4bfdecaaaa335
2016-05-12 20:58:55 +00:00
Adrian Roos
f46fdf877e Merge "DPM control for remote input when locked" into nyc-dev
am: 11c8f5315b

* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
  DPM control for remote input when locked

Change-Id: I330777f47f51dee00623ace614271f42b6d4fca7
2016-05-12 20:58:53 +00:00
Adrian Roos
11c8f5315b Merge "DPM control for remote input when locked" into nyc-dev 2016-05-12 20:52:26 +00:00
Felipe Leme
781ba14af2 Fixed connectivity state in some power saving scenarios.
NetworkPolicyManagerService (NPMS) manages 4 type of network restriction
when apps are running on background:

- Data Saver Mode (data usage restriction on metered-networks)
- Battery Saver Mode (power restriction on all networks)
- Doze Mode (power restriction on all networks)
- App Idle (power restriction on all networks)

These restrictions affects 2 parts of the system:

- Internal framework state on NPMS which is propagated to other internal
  classes.
- External firewall rules (managed by netd).

Although each of the power-related restrictions have their own external firewall
rules, internally apps are whitelisted to them through the same
whitelist, and the current code is only updating the internal state (and
notifying the internal listeners) when Battery Saver Mode is on.

As a consequence of this problem, there are scenarios where an app
correctly does not have internet access (because the firewall rules are
properly set), but the NetworkInfo state returns the wrong state (like
CONNECTED / CONNECTED).

This CL fixes this problem by splitting the power-related logic from
updateRulesForRestrictBackgroundLocked() into its own
method (updateRulesForPowerRestrictionsLocked()), and making sure such
method is called whenever the firewall rules are updated.

Externally to this change, the CTS tests were also improved to verify
the apps get the proper connection state; it can be verified by running:

cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests \
    -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests

BUG: 28521946
Change-Id: Id5187eb7a59c549ef30e2b17627ae2d734afa789
2016-05-12 12:33:23 -07:00
Selim Cinek
d7a22f64c3 Merge "Fixed a crash when dumping groupmanager" into nyc-dev am: 95b3120d08
am: 2e0e23b684

* commit '2e0e23b68473da94b7d5abda66735e7f1d9f619d':
  Fixed a crash when dumping groupmanager

Change-Id: Ic6e6e07b46c1dc20e16f472982bd3f63e0e03311
2016-05-12 19:19:26 +00:00
Selim Cinek
2e0e23b684 Merge "Fixed a crash when dumping groupmanager" into nyc-dev
am: 95b3120d08

* commit '95b3120d089ba4e2c8d2c7e4349ef754689ed68f':
  Fixed a crash when dumping groupmanager

Change-Id: I28357779885b1d38acdc4579986293304fa11150
2016-05-12 19:16:59 +00:00
Selim Cinek
dc1bc46ea8 Merge "Fixed a crash when dumping groupmanager" into nyc-dev
am: 95b3120d08

* commit '95b3120d089ba4e2c8d2c7e4349ef754689ed68f':
  Fixed a crash when dumping groupmanager

Change-Id: I65eee546cb3bfc3b7f0a841eeb5e1ed333f696b5
2016-05-12 19:16:57 +00:00
Selim Cinek
95b3120d08 Merge "Fixed a crash when dumping groupmanager" into nyc-dev 2016-05-12 19:09:59 +00:00
Jason Monk
9287a8ec4d Merge "Update demo mode time" into nyc-dev am: 341e37d349
am: 9f3141ebee

* commit '9f3141ebee6a1b06ff95532fe9bc9e95ef66c983':
  Update demo mode time

Change-Id: Icbff19b62042d45494dc45dcfe87b4dbfbc98188
2016-05-12 18:41:02 +00:00
Jason Monk
9f3141ebee Merge "Update demo mode time" into nyc-dev
am: 341e37d349

* commit '341e37d349b001b87a7d66ea3f6a4b4ffdf4f52a':
  Update demo mode time

Change-Id: I4bc09d1f87754c8ff648b2843219bcd941aee4d8
2016-05-12 18:38:27 +00:00
Jason Monk
c178881033 Merge "Update demo mode time" into nyc-dev
am: 341e37d349

* commit '341e37d349b001b87a7d66ea3f6a4b4ffdf4f52a':
  Update demo mode time

Change-Id: Ia64c7c33aeaf66ef48f29362c68319b4abcdfdbd
2016-05-12 18:38:25 +00:00
Jason Monk
341e37d349 Merge "Update demo mode time" into nyc-dev 2016-05-12 18:34:43 +00:00
Selim Cinek
60ca7879ec Fixed a crash when dumping groupmanager
Change-Id: Id5ffb9e61c1a17d5bd7d8f58024bf84c0fbb6781
Fixes: 28706404
2016-05-12 18:26:32 +00:00
Jason Monk
7abe71c532 Update demo mode time
Change-Id: I50885c719ee06cb3fa8c3dda4fe5909efe1cb3e9
Fixes: 28740808
2016-05-12 14:05:18 -04:00
Julia Reynolds
fbb267d4f4 resolve merge conflicts of 407c434 to nyc-mr1-dev
am: 94ad652c7a

* commit '94ad652c7a23d8464e2ac30a9c9de33e16431308':
  Logging for QS settings launch.

Change-Id: Ic10a2f37a79211422758cd533994f1a30bb7e69e
2016-05-12 16:53:38 +00:00