Commit Graph

2705 Commits

Author SHA1 Message Date
Felipe Leme
c9bfc42729 Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f am: 1411952a68
am: b5987d7993

* commit 'b5987d79937b2f1b0ec68c84371aea36f7e2b8a1':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: If9e525f86b29960ed4dfdd6ca27bc5d0077454ae
2016-05-24 18:44:45 +00:00
Felipe Leme
b5987d7993 Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f
am: 1411952a68

* commit '1411952a68f6fa2d2b3a3ee9599e24026454b19b':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: I62eb108dfad2ac1ffd2b541470f01a7923d92731
2016-05-24 18:23:58 +00:00
Felipe Leme
1411952a68 Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev
am: efd3a1749f

* commit 'efd3a1749f2737199643cc29bea6132a9786223b':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: I87b596346c058c7ac8efbebb67b43664f1be0fed
2016-05-24 18:13:16 +00:00
Felipe Leme
35631e00c9 Fixed enforceMeteredApnPolicy when Data Saver is on.
When enforceMeteredApnPolicy() is called when Data Saver mode is on and
the caller's UID is not whitelisted, it should add a
NET_CAPABILITY_NOT_METERED to the capabilities.

Change-Id: Ieed4f4a7634ee023ec58c91859263655e0ba62d4
Fixes: 28608499 (and https://code.google.com/p/android/issues/detail?id=208478)
2016-05-23 09:43:53 -07:00
Erik Kline
da899a473f Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: 42a5755916 am: 81092a2de8
am: 3c0c9b0f59

* commit '3c0c9b0f59233329e5a085598f0f1678ac717df0':

Change-Id: Id5a57f95fcf00474fb14569c66a8bdd4a7b2d903
2016-05-19 04:34:18 +00:00
Erik Kline
0a1cd84c4b Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: 42a5755916 am: 8958153ac7
am: 57f4d9718e

* commit '57f4d9718ecc3598f04772a49e77e89a31a7d477':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I4a0be195dab4525258b455330ce6212987b0e6c0
2016-05-19 04:27:26 +00:00
Erik Kline
3c0c9b0f59 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: 42a5755916
am: 81092a2de8

* commit '81092a2de8d6d2cd003a88ed9dc991fa7dd0350d':

Change-Id: Id68aa8f81f11042c7583fad42da2063cbb17efe1
2016-05-19 04:27:24 +00:00
Erik Kline
57f4d9718e Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: 42a5755916
am: 8958153ac7

* commit '8958153ac7921349dd8770a33484ca96581277cc':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I314ceed6380af58fb3f6308dde11f2d29b324c66
2016-05-19 04:24:16 +00:00
Erik Kline
81092a2de8 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev
am: 42a5755916

* commit '42a5755916a21f01d264bdb58d2213dacf221cdf':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: Ic99edb732d532da27c042824e5ca07c4b35ccfa1
2016-05-19 04:21:17 +00:00
Erik Kline
42a5755916 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 2016-05-19 04:12:40 +00:00
Robin Lee
3abc4c860b Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev am: 1540a79a8b am: 43fbfbf94c" into nyc-mr1-dev-plus-aosp
am: 16fcd4b42b

* commit '16fcd4b42b026ac9d5ece854bc3c6d8a445c7fc9':

Change-Id: I09b4ac15a63b8e8972e19ffeccfa1a6eccfdded2
2016-05-18 23:53:30 +00:00
Robin Lee
c03080fe1f Merge "Lock down networking when waiting for always-on" into nyc-dev am: 1540a79a8b am: 198d6cf688
am: d198b4d891

* commit 'd198b4d891b704965bfc569da00c6206ece87177':
  Lock down networking when waiting for always-on

Change-Id: I50583a9738ac51378e5f5dcbbaa396f1aa30f97c
2016-05-18 23:53:25 +00:00
Android Build Merger (Role)
16fcd4b42b Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev am: 1540a79a8b am: 43fbfbf94c" into nyc-mr1-dev-plus-aosp 2016-05-18 23:48:27 +00:00
Robin Lee
7067ad6047 Merge "Lock down networking when waiting for always-on" into nyc-dev am: 1540a79a8b
am: 43fbfbf94c

* commit '43fbfbf94c5b8ae4353b73c36d85ff02fd36fc67':
  Lock down networking when waiting for always-on

Change-Id: I883c68faafde99eb00c37962a517dceb4a4f9d32
2016-05-18 23:47:59 +00:00
Robin Lee
d198b4d891 Merge "Lock down networking when waiting for always-on" into nyc-dev am: 1540a79a8b
am: 198d6cf688

* commit '198d6cf688403cd82921510490c49219b3bdd487':
  Lock down networking when waiting for always-on

Change-Id: I4160a61ca437d20df4342a44ed24fc6ad47962c6
2016-05-18 23:47:52 +00:00
Robin Lee
198d6cf688 Merge "Lock down networking when waiting for always-on" into nyc-dev
am: 1540a79a8b

* commit '1540a79a8b65e1f2652f4882784d6386f9661cae':
  Lock down networking when waiting for always-on

Change-Id: I7be0a85597936421750d1da0fde3d55d7d4fabc5
2016-05-18 23:42:43 +00:00
Robin Lee
1540a79a8b Merge "Lock down networking when waiting for always-on" into nyc-dev 2016-05-18 23:37:24 +00:00
Robin Lee
48bf4ec223 Lock down networking when waiting for always-on
Fix: 26694104
Fix: 27042309
Fix: 28335277
Change-Id: I47a4c9d2b98235195b1356af3dabf7235870e4fa
2016-05-19 00:26:53 +01:00
Erik Kline
c6c6abab82 DHCPv4: lease expiration is fatal, renew failures are not
Bug: 24837343

Change-Id: Ib330864f8376b0907390d581b48cff5446b3392b
2016-05-18 16:17:03 +09:00
Felipe Leme
7720a659e9 Merge "Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 54bc88cdbc am: b6b7b81ae0" into nyc-mr1-dev-plus-aosp
am: 005e8467f8

* commit '005e8467f8e919024ef8890416378c55b9a030cf':

Change-Id: Ic593bbfcf2c90d588858c9e2ae516f0a3162ca52
2016-05-17 19:08:04 +00:00
Felipe Leme
2e9555bced Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 54bc88cdbc am: 3b91df7ccf
am: e81819c43e

* commit 'e81819c43e0e304cc5dc330784b62bd4e0292774':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Ieb58dda8f4749ccf5218be5913beb488fd3247cf
2016-05-17 19:07:18 +00:00
Android Build Merger (Role)
005e8467f8 Merge "Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 54bc88cdbc am: b6b7b81ae0" into nyc-mr1-dev-plus-aosp 2016-05-17 18:51:45 +00:00
Felipe Leme
bca933d951 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 54bc88cdbc
am: b6b7b81ae0

* commit 'b6b7b81ae0b5e619f1add42a66f98c187e25da9a':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: I64af44f5b12248facbeeef66d0ff5372ec5e69ed
2016-05-17 18:50:22 +00:00
Felipe Leme
e81819c43e Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 54bc88cdbc
am: 3b91df7ccf

* commit '3b91df7ccf7ee4adf9914ffcdcbf220eb9f9fd08':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Idb223f33d6c5b1d4054bd41f4b9b9672c507986c
2016-05-17 18:47:41 +00:00
Felipe Leme
b6b7b81ae0 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev
am: 54bc88cdbc

* commit '54bc88cdbcc566015a8cda3595b375a474b3def3':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: I4e19dd2828b8b67fc7b2d2173d77a82d67d53d19
2016-05-17 18:43:43 +00:00
TreeHugger Robot
54bc88cdbc Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 2016-05-17 18:28:22 +00:00
Robin Lee
dd58655f81 Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: b0f3016b64 am: a7cc7c5b4e
am: 1cd027befe

* commit '1cd027befe8206fe4c33b1efff2bebb0584c138c':
  Make some of the UID-based VPN code reusable

Change-Id: I75d9871f8039d14f8d83be4696c3c4d4e864f9c0
2016-05-17 17:59:59 +00:00
Robin Lee
1cd027befe Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: b0f3016b64
am: a7cc7c5b4e

* commit 'a7cc7c5b4edb125961bf5c219ecf57bce7876db5':
  Make some of the UID-based VPN code reusable

Change-Id: Ie7c88ba3eebe4af85a69f330cae3df3293113d4e
2016-05-17 17:52:45 +00:00
Robin Lee
a7cc7c5b4e Merge "Make some of the UID-based VPN code reusable" into nyc-dev
am: b0f3016b64

* commit 'b0f3016b64552674681dbc742667203d36c4c86d':
  Make some of the UID-based VPN code reusable

Change-Id: I3f1b1a08059aa58cb76db6cdd070b103024b9bf3
2016-05-17 17:36:43 +00:00
TreeHugger Robot
b0f3016b64 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 2016-05-17 17:30:01 +00:00
Felipe Leme
c0343f4c3d Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a am: aeb254ec20
am: 2b4f3e3327

* commit '2b4f3e3327f2c94364be4261ce60a505a03d416e':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Ia86cbc0d7b0be02f7dad7446127c2c711bb9f771
2016-05-16 22:35:23 +00:00
Felipe Leme
2b4f3e3327 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a
am: aeb254ec20

* commit 'aeb254ec20c1cdd95c89c6406c4deaaed1918deb':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Id6197b9ee56fd06505c21c1bb5dce083998aa79a
2016-05-16 22:28:27 +00:00
Felipe Leme
aeb254ec20 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev
am: 522787f39a

* commit '522787f39a759cf8af8438641fa8df7470a1b959':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Ie2e7b14ecc0b574a8776121d3c79c768093ef4f7
2016-05-16 22:23:44 +00:00
Felipe Leme
6bd46fc303 Documented return value of getRestrictBackgroundStatus().
Change-Id: I2c15a6d5e23cbc3c9b59c975196c1c04c1294471
Fixes: 28775490
2016-05-16 13:57:19 -07:00
Felipe Leme
81fb728ce4 Added a onRestrictBackgroundBlacklistChanged() callback.
When an UID is added / removed to the Data Saver blacklist, it's
necessary to notify internal components such as the Settings UI (which
was erroneously listening to UID rules changes instead).

BUG: 28743623
BUG: 28791717

Change-Id: I11c85e141dfe074ad390fd324309d2412bfbbd45
2016-05-16 13:30:57 -07:00
Android Build Merger (Role)
ac0c51c1e2 Merge "Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: 942ee1159f am: 6f582ae1d4 am: d117f7dd99" 2016-05-13 17:37:20 +00:00
Felipe Leme
01689a690d Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: 942ee1159f am: 6f582ae1d4
am: d117f7dd99

* commit 'd117f7dd99cd4751432238496e0851e45815d9e3':

Change-Id: I2ff4fafa45f2f41a6d34e1c2b602f1152e3645e7
2016-05-13 17:35:42 +00:00
Felipe Leme
9a49aaa2c7 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: 942ee1159f am: 6f582ae1d4
am: d117f7dd99

* commit 'd117f7dd99cd4751432238496e0851e45815d9e3':

Change-Id: If85188ccc995b4f50070ca85de199280b03290f2
2016-05-13 17:32:27 +00:00
Felipe Leme
eb8d471630 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: 942ee1159f am: cc02a95cbd
am: 3d079f210c

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

Change-Id: Idd27e581b208a0d80d8fa6a4d7cf75eac82a32fd
2016-05-13 17:31:58 +00:00
Felipe Leme
d117f7dd99 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: 942ee1159f
am: 6f582ae1d4

* commit '6f582ae1d42c5767d0e5ef4fa5684b0cc9fc1feb':

Change-Id: Ic63dadce968a17a4df8b39f8904f5818d48e95ac
2016-05-13 17:29:07 +00:00
Felipe Leme
3d079f210c Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: 942ee1159f
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
6f582ae1d4 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev
am: 942ee1159f

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

Change-Id: I7ebe3864657d2147034ffae400312e94deb5ef35
2016-05-13 17:23:24 +00:00
TreeHugger Robot
942ee1159f Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev 2016-05-13 17:14:13 +00:00
Elliott Hughes
b89fe38222 resolve merge conflicts of bc90502 to nyc-dev-plus-aosp am: ddd7dd8e7f
am: 13d5a1d648

* commit '13d5a1d648bd71e92347dd30629648c90326fccf':
  Make android_net_NetUtils include what it actually uses.

Change-Id: I775c03ba7fd3895c6525d3986b564b228d34063b
2016-05-13 16:08:58 +00:00
Elliott Hughes
13d5a1d648 resolve merge conflicts of bc90502 to nyc-dev-plus-aosp
am: ddd7dd8e7f

* commit 'ddd7dd8e7f7d661e4a411f2c9f14f69a86e172a4':
  Make android_net_NetUtils include what it actually uses.

Change-Id: I84a143e1922c7180a0a1926d2cfd87b59bca137d
2016-05-13 16:06:35 +00:00
Robin Lee
6b78f4f48b Make some of the UID-based VPN code reusable
By changing some member refs into arguments and having one of the
functions create the UID range instead of adding to mVpnUsers.

This will be useful for other layers of UID filtering like having
UIDs explicitly blocked from the VPN.

Deleted one broken line of code that cleared the status intent when
a restricted profile is removed. Other than that, this commit shouldn't
change any behaviour. If it does, that's a bug.

Bug: 26694104
Change-Id: Ieb656835d3282a8ba63cc3f12a80bfae166bcf44
2016-05-13 16:03:11 +00:00
Elliott Hughes
ddd7dd8e7f resolve merge conflicts of bc90502 to nyc-dev-plus-aosp
Change-Id: Ic78042d45085718b2220107e9a84767df316440a
2016-05-13 08:57:40 -07:00
Paul Jensen
60612f8096 Merge "Merge "ApfFilter unit test" into nyc-dev am: cf12d6140b am: 771d9fe0b6" into nyc-mr1-dev-plus-aosp
am: f97396b8ad

* commit 'f97396b8ad5f57fd25f12e1661257323dad18ae4':

Change-Id: Ibef62387f6c05632432408c5e011377dd8498d6a
2016-05-13 14:47:57 +00:00
Paul Jensen
30c3ad8d61 Merge "ApfFilter unit test" into nyc-dev am: cf12d6140b am: 83e6bff540
am: 6f62c8df0f

* commit '6f62c8df0f0771cc6301c1b40c7757f3c8b6e5f8':
  ApfFilter unit test

Change-Id: Ide959b34cd6bd97620b2c14812bd362d203fd85f
2016-05-13 14:43:06 +00:00
Android Build Merger (Role)
f97396b8ad Merge "Merge "ApfFilter unit test" into nyc-dev am: cf12d6140b am: 771d9fe0b6" into nyc-mr1-dev-plus-aosp 2016-05-13 14:41:03 +00:00