Commit Graph

246466 Commits

Author SHA1 Message Date
Shreyas Basarge
d3df93a4e7 Merge "Wait for JobService to start before scheduling syncs" into nyc-dev am: a16a336
am: 1e8362d4

* commit '1e8362d44959da7d80e6da626c53ef8cda2f0718':
  Wait for JobService to start before scheduling syncs

Change-Id: I54c74b747b16012ec513c8e9f38fec10f38a8ee3
2016-04-26 09:30:01 +00:00
Shreyas Basarge
1e8362d449 Merge "Wait for JobService to start before scheduling syncs" into nyc-dev
am: a16a336

* commit 'a16a3362b535fcb970756a39fd4657bd15922592':
  Wait for JobService to start before scheduling syncs

Change-Id: I05eb60240bb9cf4885e9e5df4470a93f89930b21
2016-04-26 09:27:00 +00:00
Shreyas Basarge
a16a3362b5 Merge "Wait for JobService to start before scheduling syncs" into nyc-dev 2016-04-26 09:23:30 +00:00
Android Build Merger (Role)
48cec39c41 Merge "Merge "Close open sockets when enabling firewall rules." into nyc-dev am: b414eb8 am: f35865b" into nyc-mr1-dev-plus-aosp 2016-04-26 09:03:53 +00:00
Lorenzo Colitti
126e78396e Merge "Close open sockets when enabling firewall rules." into nyc-dev am: b414eb8
am: f35865b

* commit 'f35865b71a1030d8b68b720ff073a4a3f4945155':
  Close open sockets when enabling firewall rules.

Change-Id: I3a1a13f20322d0e93f3cc083c2abb63d05fd68f5
2016-04-26 09:03:24 +00:00
Lorenzo Colitti
6dca32f12b Merge "Close open sockets when enabling firewall rules." into nyc-dev am: b414eb8
am: 05227fd

* commit '05227fd3d09af9ea9391140be421919273dcb59f':
  Close open sockets when enabling firewall rules.

Change-Id: I61358cc68858cb37af7cfb633d6b55eb086b47f4
2016-04-26 09:03:19 +00:00
Lorenzo Colitti
05227fd3d0 Merge "Close open sockets when enabling firewall rules." into nyc-dev
am: b414eb8

* commit 'b414eb8de66153d835090a1518017bc11489bce4':
  Close open sockets when enabling firewall rules.

Change-Id: I915ce66c1d3c1a65e005324fedb7f76557e3b006
2016-04-26 08:59:47 +00:00
Lorenzo Colitti
f35865b71a Merge "Close open sockets when enabling firewall rules." into nyc-dev
am: b414eb8

* commit 'b414eb8de66153d835090a1518017bc11489bce4':
  Close open sockets when enabling firewall rules.

Change-Id: I2bb4be1cec701e9e99d264ab4fd2322bc20e7d2c
2016-04-26 08:59:43 +00:00
Lorenzo Colitti
b414eb8de6 Merge "Close open sockets when enabling firewall rules." into nyc-dev 2016-04-26 08:52:26 +00:00
Android Build Merger (Role)
3ca9165da9 Merge "Merge "IpManager: delete dead getLinkProperties() code" into nyc-dev am: e24708e am: 777a66e" into nyc-mr1-dev-plus-aosp 2016-04-26 07:23:10 +00:00
Erik Kline
0ab71aa963 Merge "IpManager: delete dead getLinkProperties() code" into nyc-dev am: e24708e
am: 777a66e

* commit '777a66e4a417afbcb63888c2b908242072b328e3':
  IpManager: delete dead getLinkProperties() code

Change-Id: I0f84efa43f94f14539999c2cdecaeee02ea41bff
2016-04-26 07:22:33 +00:00
Erik Kline
34a7e40f48 Merge "IpManager: delete dead getLinkProperties() code" into nyc-dev am: e24708e
am: 6dccee3

* commit '6dccee3ecd0dd16c0c10ae74e06119d9b3bfcf92':
  IpManager: delete dead getLinkProperties() code

Change-Id: Id7587d7153516a87e5609243743fae08df501cb0
2016-04-26 07:22:30 +00:00
Erik Kline
6dccee3ecd Merge "IpManager: delete dead getLinkProperties() code" into nyc-dev
am: e24708e

* commit 'e24708e87f6d1f4a79a5cf3caf2edc658355263c':
  IpManager: delete dead getLinkProperties() code

Change-Id: Ib0cf95fe58bc7eba19c4d28ffaacb4fc9e1b717d
2016-04-26 07:19:49 +00:00
Erik Kline
777a66e4a4 Merge "IpManager: delete dead getLinkProperties() code" into nyc-dev
am: e24708e

* commit 'e24708e87f6d1f4a79a5cf3caf2edc658355263c':
  IpManager: delete dead getLinkProperties() code

Change-Id: I36e2f48b9edc846a59830c935794c51b3c922ff3
2016-04-26 07:19:48 +00:00
Erik Kline
e24708e87f Merge "IpManager: delete dead getLinkProperties() code" into nyc-dev 2016-04-26 07:15:00 +00:00
Erik Kline
b2ff48bd71 IpManager: delete dead getLinkProperties() code
Now that it's long since been unused also delete the locking that was
introduced to make it possible.

Bug: 17733693
Bug: 24837343
Change-Id: Iee817a7c2e1d1dc9c080d3124d5986232dcda00f
2016-04-26 15:54:12 +09:00
Android Build Merger (Role)
885644a56d Merge "Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev am: bdc4700 am: 12376eb" into nyc-mr1-dev-plus-aosp 2016-04-26 06:12:15 +00:00
Jaewan Kim
ef90e647dc Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev am: bdc4700
am: 12376eb

* commit '12376ebc4be5246cb6ddfcf44421dc27e8060738':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: I1d22cb0a646103e6b2ec972838af30680b580e3f
2016-04-26 06:11:44 +00:00
Jaewan Kim
8416446ef7 Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev am: bdc4700
am: 0f360d8

* commit '0f360d80adb6c16064b5717f552aa2704bcddb45':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: I8990fc7505e8f66fe23309b96097909771af813d
2016-04-26 06:11:40 +00:00
Jaewan Kim
12376ebc4b Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev
am: bdc4700

* commit 'bdc4700155f5ff89e213cb0e9efe49897b888f7d':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: I72405b64139580d0a95872eb5d47f3a2f5f3d28d
2016-04-26 06:09:00 +00:00
Jaewan Kim
0f360d80ad Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev
am: bdc4700

* commit 'bdc4700155f5ff89e213cb0e9efe49897b888f7d':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: Ic77538cac9562acf878c7c56f443a691e9d0b45f
2016-04-26 06:08:59 +00:00
Jaewan Kim
bdc4700155 Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist" into nyc-dev 2016-04-26 06:03:01 +00:00
Lorenzo Colitti
4cb4240b4d Close open sockets when enabling firewall rules.
When enabling a firewall rule that will deny networking to apps,
first close any sockets opened by those apps. Just dropping an
app's packets without closing its connections  has the following
problems:

1. The app has no way to know this has happened until a network
   timeout occurs.
2. The app's connections stay open, so the other end of the
   connection (e.g., a server) might continue to retransmit
   packets. These packets will wake up the kernel and cause
   battery drain, but we cannot respond to them because packets
   on those connections are dropped by the kernel (since the app
   is blackholed). So the other end might keep retransmitting.
3. Even though we think the connections are still open, the
   other end of the connection, or any intermediate NATs or
   firewalls, might time out and close the connection (e.g., by
   sending a RST). Because the app is blackholed, we have no way
   of knowing that this has happened, so when the app is granted
   network access again, these connections might just get stuck.

Bug: 27824851
Bug: 27867653
Change-Id: Iaaad1b26954fc5f1ba5c9ed8bdee039282f5e249
2016-04-26 13:39:08 +09:00
Jaewan Kim
f0fd218382 PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist
Bug: 27954955
Change-Id: I517e378d5c1672ac0eb87bdf4375b7d733276e58
2016-04-26 13:06:21 +09:00
Android Build Merger (Role)
2c24a015a3 Merge "Merge "When dumping connectivity metrics events, print data as well." into nyc-dev am: e4860f0 am: 09bd1c1" into nyc-mr1-dev-plus-aosp 2016-04-26 03:34:24 +00:00
Android Build Merger (Role)
05b4399242 Merge "Merge "When dumping connectivity metrics events, print data as well." into nyc-dev am: e4860f0 am: 8711593" into nyc-mr1-dev-plus-aosp 2016-04-26 03:34:17 +00:00
Android Build Merger (Role)
0a8a474ddf Merge "Fix a few issues with occluded Keyguard am: c5804af am: c394db8" into nyc-mr1-dev-plus-aosp 2016-04-26 03:34:12 +00:00
Lorenzo Colitti
a8a376f8a8 Merge "When dumping connectivity metrics events, print data as well." into nyc-dev am: e4860f0
am: 09bd1c1

* commit '09bd1c1a64c7b9b14f948d16cd3faaaee047d861':
  When dumping connectivity metrics events, print data as well.

Change-Id: I9603374c13b252abdbd8dc3fe396108f25b20938
2016-04-26 03:33:39 +00:00
Lorenzo Colitti
b02d66d357 Merge "When dumping connectivity metrics events, print data as well." into nyc-dev am: e4860f0
am: 8711593

* commit '87115932c5163e6cbc5196335837c254f3978fd1':
  When dumping connectivity metrics events, print data as well.

Change-Id: I9243c3be82d24fee22ff7eddb50f8f8bc8fe59a2
2016-04-26 03:33:36 +00:00
Jorim Jaggi
b3fda0defb Fix a few issues with occluded Keyguard am: c5804af
am: c394db8

* commit 'c394db8013be6fdb334b782fc145d3eec0dd3b52':
  Fix a few issues with occluded Keyguard

Change-Id: If030fe3991c94145e62f0465c6873c6999d69175
2016-04-26 03:33:36 +00:00
Jorim Jaggi
4e9959e10d Fix a few issues with occluded Keyguard am: c5804af
am: a5bc2fe

* commit 'a5bc2fe41d7a0fb694f5409766f7cdd3f085490f':
  Fix a few issues with occluded Keyguard

Change-Id: I04393556e2739435e44e7cc8f4e265a07ed9bc81
2016-04-26 03:33:35 +00:00
Lorenzo Colitti
87115932c5 Merge "When dumping connectivity metrics events, print data as well." into nyc-dev
am: e4860f0

* commit 'e4860f02564e887918192f733a29f04552f83414':
  When dumping connectivity metrics events, print data as well.

Change-Id: I63c0b56f9f54e0df794b3061e310c702f638b857
2016-04-26 03:28:34 +00:00
Lorenzo Colitti
09bd1c1a64 Merge "When dumping connectivity metrics events, print data as well." into nyc-dev
am: e4860f0

* commit 'e4860f02564e887918192f733a29f04552f83414':
  When dumping connectivity metrics events, print data as well.

Change-Id: Ie2da40fc6ba7a52d359c4b0be4f938ee7eb95b73
2016-04-26 03:28:32 +00:00
Jorim Jaggi
c394db8013 Fix a few issues with occluded Keyguard
am: c5804af

* commit 'c5804afa73edbf229e789570d288e66f70b54fa2':
  Fix a few issues with occluded Keyguard

Change-Id: I0e805ee2b7cf37b60b08f951bf1e0e4fdde93464
2016-04-26 03:28:31 +00:00
Jorim Jaggi
a5bc2fe41d Fix a few issues with occluded Keyguard
am: c5804af

* commit 'c5804afa73edbf229e789570d288e66f70b54fa2':
  Fix a few issues with occluded Keyguard

Change-Id: Ibf2f0848c597a0223e2a8c5e361c669f23e2c0fb
2016-04-26 03:28:31 +00:00
Lorenzo Colitti
e4860f0256 Merge "When dumping connectivity metrics events, print data as well." into nyc-dev 2016-04-26 03:22:26 +00:00
Jorim Jaggi
c5804afa73 Fix a few issues with occluded Keyguard
- When we get a collapse before the layout happened in SystemUI,
don't expand the panel after the layout.
- Don't reset waitingToShow when coming out of sleep. This will cause
win.isVisibleOrBehindKeyguardLw to return false and then occluded
state will change rapidly from true -> false -> true, leading to
flickering in SysUI.

Bug: 23898941
Change-Id: I2b941188de777086bb2b477f5bfc00cc0cd6abe0
2016-04-26 02:54:34 +00:00
Android Build Merger (Role)
21ea5da07a Merge "Merge "Don\'t hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev am: 72c216f am: c8cd948" into nyc-mr1-dev-plus-aosp 2016-04-26 02:30:24 +00:00
TreeHugger Robot
673f708ec0 Merge "Don\'t hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev am: 72c216f
am: c8cd948

* commit 'c8cd9483ea98d07d73be556148c1a44e206278a2':
  Don't hide app windows due to not showing when locked when keyguard is hidden

Change-Id: Ie6487a016af109f9f07c844c48a49f0bc5f96fb0
2016-04-26 02:29:57 +00:00
TreeHugger Robot
b34e557681 Merge "Don\'t hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev am: 72c216f
am: e482eaf

* commit 'e482eaf6dffbae98e533b01628f161ce0a48be6d':
  Don't hide app windows due to not showing when locked when keyguard is hidden

Change-Id: Ib7128e2019536c8570de81b060ae256ffd256a46
2016-04-26 02:29:54 +00:00
Wale Ogunwale
e482eaf6df Merge "Don\'t hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev
am: 72c216f

* commit '72c216f25072123f498105bc7ad98a65a7a3cdaf':
  Don't hide app windows due to not showing when locked when keyguard is hidden

Change-Id: I93e02ad16b4dc0c92a7e02432b992cbbe9c77aa1
2016-04-26 02:27:21 +00:00
Wale Ogunwale
c8cd9483ea Merge "Don\'t hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev
am: 72c216f

* commit '72c216f25072123f498105bc7ad98a65a7a3cdaf':
  Don't hide app windows due to not showing when locked when keyguard is hidden

Change-Id: I33795a8690e52d26b6f66f991b03b16bdeb665f4
2016-04-26 02:27:20 +00:00
TreeHugger Robot
72c216f250 Merge "Don't hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev 2016-04-26 02:21:18 +00:00
Android Build Merger (Role)
a0a3942613 Merge "Make sure to notify divider always am: d6a3949 am: 821bbc1" into nyc-mr1-dev-plus-aosp 2016-04-26 01:01:54 +00:00
Jorim Jaggi
c89b6a33cb Make sure to notify divider always am: d6a3949
am: 821bbc1

* commit '821bbc186f08912499b82e561d9179860cd6df33':
  Make sure to notify divider always

Change-Id: Ibc43f5fcf1f507038c5c5c234b5b4d4db94f0bc4
2016-04-26 01:01:18 +00:00
Jorim Jaggi
93b6a716db Make sure to notify divider always am: d6a3949
am: d7d1c45

* commit 'd7d1c455c5ade0df30c30fc9b8d44314f4017385':
  Make sure to notify divider always

Change-Id: Id71d05afefd9f82b4c930dab4ee08e93cc1223e3
2016-04-26 01:01:14 +00:00
Jorim Jaggi
d7d1c455c5 Make sure to notify divider always
am: d6a3949

* commit 'd6a39495881ee89c9217ab0764b948b6eb773aea':
  Make sure to notify divider always

Change-Id: Id11d39eeb9e513f6ecbb977572c426cdf3af7814
2016-04-26 00:58:42 +00:00
Jorim Jaggi
821bbc186f Make sure to notify divider always
am: d6a3949

* commit 'd6a39495881ee89c9217ab0764b948b6eb773aea':
  Make sure to notify divider always

Change-Id: I8d39ba246a89096e2fb1462ad4e6bfe33710fd7d
2016-04-26 00:58:40 +00:00
Jorim Jaggi
d6a3949588 Make sure to notify divider always
In some cases, recents didn't get resumed, so divider was never
notified and thus we didn't start the animation. Instead, move
the first drawn logic into onStart.

Bug: 28366529
Change-Id: Ia71d6b517451bba727ae31a184bb55cecf5af198
2016-04-26 00:52:46 +00:00
Wale Ogunwale
23fd1db68d Don't hide app windows due to not showing when locked when keyguard is hidden
This worked in pre-N because the only visible app was the app that can be
shown when the keyguard is hidden. That isn't the case in multi-window mode
where one of the apps can be shown when locked and the other doesn't have
the show when locked flag. Only hide the other app if the keyguard is shown.

Bug: 28368875
Change-Id: I5039098db74492fadf667fed24fc58448436681a
2016-04-25 17:21:34 -07:00