Commit Graph

2835 Commits

Author SHA1 Message Date
Android Build Merger (Role)
f334dd564b Merge "Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 8debc39f17 am: 29052a804a" into nyc-mr1-dev-plus-aosp 2016-05-17 18:51:45 +00:00
Felipe Leme
a5333e4fc7 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 8debc39f17
am: 29052a804a

* commit '29052a804ade79cfe0892a9a2a4a46f639c1a0d1':
  Added a onRestrictBackgroundBlacklistChanged() callback.

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

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

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

* commit '8debc39f1727ee4540e08cf699a6fde75268a5da':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: I4e19dd2828b8b67fc7b2d2173d77a82d67d53d19
2016-05-17 18:43:43 +00:00
TreeHugger Robot
8debc39f17 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 2016-05-17 18:28:22 +00:00
Robin Lee
9b3fdfaab8 Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: 89bf3e3aa2 am: 0ab7ea1701
am: 9355427d9a

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

Change-Id: I75d9871f8039d14f8d83be4696c3c4d4e864f9c0
2016-05-17 17:59:59 +00:00
Robin Lee
9355427d9a Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: 89bf3e3aa2
am: 0ab7ea1701

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

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

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

Change-Id: I3f1b1a08059aa58cb76db6cdd070b103024b9bf3
2016-05-17 17:36:43 +00:00
TreeHugger Robot
89bf3e3aa2 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 2016-05-17 17:30:01 +00:00
Robin Lee
2543ed8799 Return legacy VPN info regardless of lockdown mode
This stops Settings from telling the user detailed information, and
doesn't really protect anything secret -- privileged apps can already
tell that there's an active VPN by looking at network info.

Change-Id: I9c2a3cab6dff1b62e94a9e0735dccde226fd26a3
Fix: 28624328
2016-05-17 14:31:52 +01:00
Felipe Leme
c202fc8bd6 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a am: ac719e480f
am: 2a7165b928

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

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

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

Change-Id: Id6197b9ee56fd06505c21c1bb5dce083998aa79a
2016-05-16 22:28:27 +00:00
Felipe Leme
ac719e480f 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
3edc616bf6 Documented return value of getRestrictBackgroundStatus().
Change-Id: I2c15a6d5e23cbc3c9b59c975196c1c04c1294471
Fixes: 28775490
2016-05-16 13:57:19 -07:00
Felipe Leme
57fc863cce 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)
079de0bd05 Merge "Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: bc26d925c6 am: 0ee15c2e57 am: be24cac6d6" 2016-05-13 17:37:20 +00:00
Felipe Leme
22b4cc077c Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: bc26d925c6 am: 0ee15c2e57
am: be24cac6d6

* commit 'be24cac6d6c4e09f508e81dc8dd545a188a035cf':

Change-Id: I2ff4fafa45f2f41a6d34e1c2b602f1152e3645e7
2016-05-13 17:35:42 +00:00
Felipe Leme
5ef19be783 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: bc26d925c6 am: 0ee15c2e57
am: be24cac6d6

* commit 'be24cac6d6c4e09f508e81dc8dd545a188a035cf':

Change-Id: If85188ccc995b4f50070ca85de199280b03290f2
2016-05-13 17:32:27 +00:00
Felipe Leme
651b527311 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: bc26d925c6 am: cc02a95cbd
am: 492e99b2be

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

Change-Id: Idd27e581b208a0d80d8fa6a4d7cf75eac82a32fd
2016-05-13 17:31:58 +00:00
Felipe Leme
be24cac6d6 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: bc26d925c6
am: 0ee15c2e57

* commit '0ee15c2e57d33665eafea69d7ec6ce86cfbfef87':

Change-Id: Ic63dadce968a17a4df8b39f8904f5818d48e95ac
2016-05-13 17:29:07 +00:00
Felipe Leme
492e99b2be Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: bc26d925c6
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
0ee15c2e57 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev
am: bc26d925c6

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

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

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

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

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

Change-Id: I84a143e1922c7180a0a1926d2cfd87b59bca137d
2016-05-13 16:06:35 +00:00
Robin Lee
722ee0bb43 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
bdd12ec7b3 resolve merge conflicts of bc90502 to nyc-dev-plus-aosp
Change-Id: Ic78042d45085718b2220107e9a84767df316440a
2016-05-13 08:57:40 -07:00
Paul Jensen
271cf91dc9 Merge "Merge "ApfFilter unit test" into nyc-dev am: 906b94c00b am: 771d9fe0b6" into nyc-mr1-dev-plus-aosp
am: 2e5feeef6c

* commit '2e5feeef6c607ff24598ee7b47ac58d754df472b':

Change-Id: Ibef62387f6c05632432408c5e011377dd8498d6a
2016-05-13 14:47:57 +00:00
Paul Jensen
2fb47c132e Merge "ApfFilter unit test" into nyc-dev am: 906b94c00b am: 6e7084024f
am: 2a7cb091a3

* commit '2a7cb091a35bcd126ba4ca53b337b88ad65e3161':
  ApfFilter unit test

Change-Id: Ide959b34cd6bd97620b2c14812bd362d203fd85f
2016-05-13 14:43:06 +00:00
Android Build Merger (Role)
2e5feeef6c Merge "Merge "ApfFilter unit test" into nyc-dev am: 906b94c00b am: 771d9fe0b6" into nyc-mr1-dev-plus-aosp 2016-05-13 14:41:03 +00:00
Paul Jensen
2f1c97e468 Merge "ApfFilter unit test" into nyc-dev am: 906b94c00b
am: 771d9fe0b6

* commit '771d9fe0b607a953f2efbb64745c1e68f4fced01':
  ApfFilter unit test

Change-Id: I00a8b46efdd8e52d2756723f2e11b48e3231eff6
2016-05-13 14:40:42 +00:00
Paul Jensen
2a7cb091a3 Merge "ApfFilter unit test" into nyc-dev am: 906b94c00b
am: 6e7084024f

* commit '6e7084024fbbc93b301345ecb581f128b23bec08':
  ApfFilter unit test

Change-Id: I17ddf9d4823588dd2cad0d5662ec434ae2d027f6
2016-05-13 14:40:39 +00:00
Paul Jensen
6e7084024f Merge "ApfFilter unit test" into nyc-dev
am: 906b94c00b

* commit '906b94c00bdf71cd0870416c07fcceaed67d421d':
  ApfFilter unit test

Change-Id: I97bdf703c24c8c3008113c09f5f441cd1d74bc81
2016-05-13 14:38:13 +00:00
Paul Jensen
906b94c00b Merge "ApfFilter unit test" into nyc-dev 2016-05-13 14:33:25 +00:00
Felipe Leme
16e0f1b4c4 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
Elliott Hughes
9d18567aeb Make android_net_NetUtils include what it actually uses.
Bug: http://b/28519060
Change-Id: I49dcd358d3fc8e0ba5c5e0b50a0f5dcc63281d22
2016-05-11 15:18:13 -07:00
Antonio Cansado
01206517e6 Merge "Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev am: dc5f558640 am: de224ba451" into nyc-mr1-dev-plus-aosp
am: d7021ad5d5

* commit 'd7021ad5d54422949067db1165a8c8ff95c8c93e':

Change-Id: I7a1644a097b8edbaa0da0b80c0e2b6f374f99cf1
2016-05-10 21:14:17 +00:00
Antonio Cansado
c864144517 Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev am: dc5f558640 am: 6fe5aa1af4
am: 4247c46428

* commit '4247c464282bf8c9c458090f0e6b491cf9bc8c63':
  Addressing API council comments on NetworkStatsManager.

Change-Id: Ie6455799758f0bdb67440f72c266effaf412e22f
2016-05-10 21:14:09 +00:00
Android Build Merger (Role)
d7021ad5d5 Merge "Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev am: dc5f558640 am: de224ba451" into nyc-mr1-dev-plus-aosp 2016-05-10 21:08:59 +00:00
Antonio Cansado
1d7c800c19 Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev am: dc5f558640
am: de224ba451

* commit 'de224ba451547fcc139ec6c565243e0f450ece46':
  Addressing API council comments on NetworkStatsManager.

Change-Id: I1383b3c11653daaa3a0ca34600dbc7e28af24641
2016-05-10 21:08:28 +00:00
Antonio Cansado
4247c46428 Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev am: dc5f558640
am: 6fe5aa1af4

* commit '6fe5aa1af45379cc93ec8456b2b947b3a0cfed4a':
  Addressing API council comments on NetworkStatsManager.

Change-Id: Ia886e1ce98520c1618ba501097a2c979a628bbb4
2016-05-10 21:08:25 +00:00
Antonio Cansado
6fe5aa1af4 Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev
am: dc5f558640

* commit 'dc5f558640da8785fabc274167ec37a0fda30cd6':
  Addressing API council comments on NetworkStatsManager.

Change-Id: I952e69e7cfbd8cebcbac7c3b19ede300e26777e8
2016-05-10 21:05:17 +00:00
Antonio Cansado
13726d128a Addressing API council comments on NetworkStatsManager.
Callbacks
 - DataUsageCallback renamed to UsageCallback
 - DataUsagePolicy removed; passing in params directly to register method
 - making it an abstract class
 - passing in (networkType, subscriberId) that reached its threshold
 - renaming onLimitReached to onThresholdReached to match existing naming
 - only monitor single network,subscriberId
 - no monitoring of specific uids; using device or user wide instead

Tags
 - only owner uid can read its tags
 - exposing only TAG_NONE to match service side

BUG: 27530098

Change-Id: I2b2664da71806868a1e937d2bf4d1f234637509b
2016-05-10 13:24:16 -07:00
Paul Jensen
a9ae8bb696 ApfFilter unit test
Bug: 26238573

Change-Id: I5171038228782bd54e91f5bcc663cc529d2c1150
2016-05-10 11:54:42 -04:00
Felipe Leme
7c38c68128 Merge "Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e8140 am: 4e40ea69d0" into nyc-mr1-dev-plus-aosp
am: f7d3b5fbd4

* commit 'f7d3b5fbd411a76a8fa5b550da699ed497c315af':

Change-Id: I84bb94fff82e9a7965147b0bb1736ab5529b6c8d
2016-05-06 23:48:57 +00:00
Felipe Leme
89d7d6d5c7 Merge "Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e8140 am: 4e40ea69d0" into nyc-mr1-dev-plus-aosp
am: 725e9d0ad8

* commit '725e9d0ad8a1ba44117d0ed14c424dfb976e967e':

Change-Id: I681d58e763bec7b22b2962c98661576f534d6669
2016-05-06 23:48:54 +00:00
Felipe Leme
04ba6ab37a Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e8140 am: 87d20317bf
am: ffeacedc35

* commit 'ffeacedc355fe9dd8b331a27294eac5dea813e5b':
  Fixed connectivity state in some restricted network scenarios.

Change-Id: I1bc51c4a06dad9245ce0ed884707855b2c04edf1
2016-05-06 23:48:47 +00:00
Android Build Merger (Role)
f7d3b5fbd4 Merge "Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e8140 am: 4e40ea69d0" into nyc-mr1-dev-plus-aosp 2016-05-06 23:47:02 +00:00
Felipe Leme
8ba1a4ad8b Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e8140
am: 4e40ea69d0

* commit '4e40ea69d0e4cdba9f0215509eadd54d7706eb34':

Change-Id: Ic58995d889136c62d397bb8323ed8b66be90e3cf
2016-05-06 23:46:37 +00:00
Android Build Merger (Role)
725e9d0ad8 Merge "Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e8140 am: 4e40ea69d0" into nyc-mr1-dev-plus-aosp 2016-05-06 23:44:23 +00:00