Commit Graph

2571 Commits

Author SHA1 Message Date
Antonio Cansado
c24a9e3baa 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
3bbf833ff4 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
Android Build Merger (Role)
597409049c Merge "Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e8140 am: f39d22efcf" into nyc-mr1-dev-plus-aosp 2016-05-06 23:47:02 +00:00
Felipe Leme
bac2fa1d05 Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e8140
am: f39d22efcf

* commit 'f39d22efcf7db6043e13fbc093de2799c3ccf531':

Change-Id: Ic58995d889136c62d397bb8323ed8b66be90e3cf
2016-05-06 23:46:37 +00:00
Android Build Merger (Role)
67ff40fadd Merge "Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e8140 am: f39d22efcf" into nyc-mr1-dev-plus-aosp 2016-05-06 23:44:23 +00:00
Felipe Leme
d9c0f5c6a1 Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e8140
am: 87d20317bf

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

Change-Id: Ifeb332fbf00c554b78d0ad724b34e3a8ebfc9894
2016-05-06 23:43:55 +00:00
Felipe Leme
bb507dda10 Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e8140
am: f39d22efcf

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

Change-Id: I76e419d0d010652699b9081418f5f654763887d1
2016-05-06 23:43:52 +00:00
Felipe Leme
f39d22efcf Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev
am: 638a6e8140

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

Change-Id: I0fd66b16c83680940f294ea8e117443ffd8a50cd
2016-05-06 23:38:59 +00:00
Android Build Merger (Role)
de65e700d1 Merge "Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev am: de66540fd3 am: 0da215640f" into nyc-mr1-dev-plus-aosp 2016-05-06 21:58:55 +00:00
Felipe Leme
a3ada5e487 Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev am: de66540fd3
am: 0da215640f

* commit '0da215640fa1aa90e7f3063cfa23df629f268ff2':
  Refactored NetworkPolicyManagerService mUidRules.

Change-Id: I58c29071b21ffdd9285b33964bfc2c5b254dd298
2016-05-06 21:58:26 +00:00
Felipe Leme
877112035d Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev am: de66540fd3
am: de4c468267

* commit 'de4c468267e163a7085f4afd4352f0a182331d13':
  Refactored NetworkPolicyManagerService mUidRules.

Change-Id: Ie81707e54ebf15e5b01a533bda433551d0a3b73e
2016-05-06 21:58:18 +00:00
Felipe Leme
b414e6f2a3 Fixed connectivity state in some restricted network scenarios.
NetworkPolicyManagerService (NMPS) keeps an internal list of uid
rules (mUidRules) for network restrictions, and when these rules
changes it needs to notify external listeners (such as
ConnectivityService / CS).

Prior to Android N, both Data Saver mode (the feature previously known
as "Restrict Baground Data") and Battery Save mode used the same set of
firewall rules to implement their restrictions: when Battery Saver mode
NPMS would mark all networks as metered and set the proper firewall
rules externally.

Recently, these 2 modes were split in 2 distinct firewall rules and
NMPS.updateRuleForRestrictBackgroundLocked() was changed to update
the mUidRules logic based on the Data Saver firewall (since the Battery
Saver firewall changes are handled externally, on
updateRuleForRestrictPowerLocked()). As such, CS was not notified when
the power-related changes were made, which would cause apps to get a
state of CONNECTED / CONNECTED when querying its active connection.

Another scenario that is not properly handled is when a UID whitelisted
for Data Saver is brought back to foreground: although the proper
firewall rules are set, CS is not notified, and the apps state would be
DISCONNECTED / BLOCKED.

This CL introduces many changes that fix this issue:

- Fixed updateRuleForRestrictBackgroundLocked() to invoke
  onUidRulesChanged() when the Battery Saver status changed.
- Fixed updateRuleForRestrictBackgroundLocked() to invoke
  onUidRulesChanged() when an app whitelisted for Data Saver is brought
  back to the foreground.
- Added a new API (onRestrictPowerChanged() and getRestrictPower())
  to notify external services about Battery Saver mode changes.
- Fixed CS logic to properly handle the Battery Saver changes.

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

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

BUG: 28521946

Change-Id: I8eaccd39968eb4b8c6b34f462fbc541e5daf55f1
2016-05-06 14:53:50 -07:00
Felipe Leme
de4c468267 Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev
am: de66540fd3

* commit 'de66540fd3f73937c3cfbe1d50e575aa69acc474':
  Refactored NetworkPolicyManagerService mUidRules.

Change-Id: I25d2520eafcf8c45b80b94908a3b5bfa04315f76
2016-05-06 21:53:39 +00:00
Felipe Leme
b30ef31381 Refactored NetworkPolicyManagerService mUidRules.
NetworkPolicyManagerService (NMPS) keeps an internal list of uid
rules (mUidRules) for network restrictions, and when these rules
changes it needs to notify external listeners (such as
ConnectivityService / CS).

Prior to Android N, both Data Saver mode (the feature previously known
as "Restrict Baground Data") and Battery Save mode used the same set of
firewall rules to implement their restrictions: when Battery Saver mode
NPMS would mark all networks as metered and set the proper firewall
rules externally.

Recently, these 2 modes were split in 2 distinct firewall rules and
NMPS.updateRuleForRestrictBackgroundLocked() was changed to update
the mUidRules logic based on the Data Saver firewall (since the Battery
Saver firewall changes are handled externally, on
updateRuleForRestrictPowerLocked()). As such, CS was not notified when
the power-related changes were made, which would cause apps to get a
state of CONNECTED / CONNECTED when querying its active connection.

This change refactores the mUidRules to use bitmasks, in preparation for
another change that will fix the issue.

It also fixes a minor bug that was preventing removed packages to be
removed from the whitelist.

BUG: 28521946
Change-Id: I9f0e1509a6192cad403f740c1cd76a6b7dab7d26
2016-05-06 17:58:40 +00:00
Android Build Merger (Role)
fb450bf661 Merge "Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 4c2242b254 am: 7f13b648df" into nyc-mr1-dev-plus-aosp 2016-05-04 21:48:26 +00:00
Android Build Merger (Role)
21d0fa8c49 Merge "Merge changes I31d5260d,Ied92f558 into nyc-dev am: 9677633814 am: adab05fdfc" into nyc-mr1-dev-plus-aosp 2016-05-04 21:48:10 +00:00
Robin Lee
10dcbb6768 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 4c2242b254
am: 7f13b648df

* commit '7f13b648df95a300e117efffc015b5621c329828':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I79cc73d918ff368534d7e269291cb6d24e6774ac
2016-05-04 21:42:55 +00:00
Robin Lee
b9a2ef1e09 Merge changes I31d5260d,Ied92f558 into nyc-dev am: 9677633814
am: adab05fdfc

* commit 'adab05fdfc7ff389b65cb949b5c66d5c96f68382':
  Start VPN as early as possible during startup
  Split network agent created state from connected state

Change-Id: Ibb02f2731536ebafaa4c24ef5cd2113f7cd43632
2016-05-04 21:42:47 +00:00
Robin Lee
7c540243de Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 4c2242b254
am: 78d0888e8c

* commit '78d0888e8c9358681a6f564b30b2cc35bbe72a45':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I7ec39775980ec839aa814cf284ea352789aa788f
2016-05-04 21:41:23 +00:00
Robin Lee
1054057e75 Merge changes I31d5260d,Ied92f558 into nyc-dev am: 9677633814
am: 31b3676cce

* commit '31b3676ccec847b1e86c23b2f5073dc1cc83abf4':
  Start VPN as early as possible during startup
  Split network agent created state from connected state

Change-Id: I6bb605a83b96a3efab36ab6a7bdb5859e1eafea8
2016-05-04 21:40:46 +00:00
Robin Lee
7f13b648df Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
am: 4c2242b254

* commit '4c2242b254668caa96abc59e9f6c08eef7dc3784':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: Ibc69bb988ba0d1e641ee48fb5a844dc414f58e07
2016-05-04 18:55:54 +00:00
Robin Lee
adab05fdfc Merge changes I31d5260d,Ied92f558 into nyc-dev
am: 9677633814

* commit '9677633814868394f11097c549cea65155f80c29':
  Start VPN as early as possible during startup
  Split network agent created state from connected state

Change-Id: I55167ad8f3cde11407a2d35b0f859c263c0fbbec
2016-05-04 18:55:11 +00:00
Robin Lee
4c2242b254 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 2016-05-04 18:38:30 +00:00
Robin Lee
9677633814 Merge changes I31d5260d,Ied92f558 into nyc-dev
* changes:
  Start VPN as early as possible during startup
  Split network agent created state from connected state
2016-05-04 18:35:19 +00:00
Robin Lee
3cc9ba48ef Start VPN as early as possible during startup
- Switch from USER_STARTING to USER_STARTED which is the foreground
  version of the broadcast

- Set the new VPN network as CONNECTING initially to avoid spamming
  apps with useless notifications ahead of the network being fully
  available

Bug: 26694104
Fix: 28335277
Change-Id: I31d5260dda62ff440c31c44eb0aa5c891e2717e5
2016-05-04 17:46:10 +01:00
Robin Lee
bc024e5d66 Split network agent created state from connected state
Network creation setup sometimes involves extra steps after actually
calling into netd to create the underlying network, rules & routes &
to begin allowing sockets bound to it.

For example, VPN networks can set a UID whitelist or blacklist. This
should happen:

  - AFTER there is a netID & network created in netd as
    network-specific rules will need to be tied to / point at it. Those
    rules are tied to the lifecycle of netd's network which is tracked
    by `NetworkAgentInfo.created` on the frameworks side.

  - BEFORE the CONNECTED broadcast and network callbacks have been sent
    out so that we don't create a race condition between clients that
    want to use the network and the server actually having the network
    ready

The race condition existed prior to this change and required any client
making use of network callbacks to sleep for a short amount of time after
receiving to actually be able to use the network.

Among other things, that race condition is now fixed.

Bug: 26694104
Change-Id: Ied92f5588a98c3e97f456bc98b676bf201ab5472
2016-05-04 16:24:46 +00:00
Robin Lee
ab2788acbc Add lockdownEnabled parameter to always-on VPN API
Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.

Bug: 26694104
Change-Id: Ibfbd43ad09a25f2e38053fcd6306df3711f8bde2
2016-05-03 13:24:42 +01:00
Android Build Merger (Role)
8683428dfb Merge "Merge changes I86257bc8,I5c2221c5 into nyc-dev am: 8925ef3257 am: 3ac235673c" into nyc-mr1-dev-plus-aosp 2016-05-02 13:05:01 +00:00
Lorenzo Colitti
f8d9a33caa Merge changes I86257bc8,I5c2221c5 into nyc-dev am: 8925ef3257
am: 3ac235673c

* commit '3ac235673cc49f7648cef4710522cc2ce76021aa':
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.

Change-Id: I69f888bb27b3bd632f63ec95558db14d59605c71
2016-05-02 13:04:25 +00:00
Lorenzo Colitti
cd8cf492fe Merge changes I86257bc8,I5c2221c5 into nyc-dev am: 8925ef3257
am: d35f90b205

* commit 'd35f90b2055e0fdf962f4dd153b148ff94c54a84':
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.

Change-Id: I36c07f09ac62620fd4119eff1f9da5a278d08144
2016-05-02 13:04:22 +00:00
Pierre Imai
d35f90b205 Merge changes I86257bc8,I5c2221c5 into nyc-dev
am: 8925ef3257

* commit '8925ef3257d71dfb9dc383706f2aa611cfcbd9dd':
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.

Change-Id: I80fdc381bd3ff33a8efa6624d7115c346789ca17
2016-05-02 13:00:13 +00:00
Lorenzo Colitti
8925ef3257 Merge changes I86257bc8,I5c2221c5 into nyc-dev
* changes:
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.
2016-05-02 12:49:19 +00:00
Pierre Imai
5b5fe390dd Use Netd's binder interface to set resolver configuration.
BUG: 25731675
Change-Id: I86257bc84371832466161e5357ae173c305a7d18
2016-05-02 08:29:21 +00:00
Android Build Merger (Role)
61cd431e8c Merge "Merge "Flag to mark foreground jobs, fix data saver." into nyc-dev am: 9a977b7d45 am: 0c5c67f743" into nyc-mr1-dev-plus-aosp 2016-04-29 23:02:13 +00:00
Jeff Sharkey
9b36c5e8f8 Merge "Flag to mark foreground jobs, fix data saver." into nyc-dev am: 9a977b7d45
am: 0c5c67f743

* commit '0c5c67f743abeba5c30112634ce82fd63ae2d1a1':
  Flag to mark foreground jobs, fix data saver.

Change-Id: Idbf3bdfc76cadfbcb6bbf17ac1aa99df72a7a0a1
2016-04-29 23:01:49 +00:00
Jeff Sharkey
a410ef9790 Merge "Flag to mark foreground jobs, fix data saver." into nyc-dev am: 9a977b7d45
am: cb8bc7c3f9

* commit 'cb8bc7c3f95b4c629489e05a221bbb42e614ce9d':
  Flag to mark foreground jobs, fix data saver.

Change-Id: I30b87193a1d5d45f4ffeb919276a70ae709a1cdc
2016-04-29 23:01:47 +00:00
Jeff Sharkey
cb8bc7c3f9 Merge "Flag to mark foreground jobs, fix data saver." into nyc-dev
am: 9a977b7d45

* commit '9a977b7d45df0d3d59c5eec7f9534c3bd5fcd91d':
  Flag to mark foreground jobs, fix data saver.

Change-Id: I908d725a84e9590d0da38a586b066a63473d4f28
2016-04-29 22:59:31 +00:00
Jeff Sharkey
833c35b354 Flag to mark foreground jobs, fix data saver.
When a job will eventually run in the foreground, the internal
scheduling needs to ignore any background network restrictions when
satisfying constraints.  This also means the job should ignore the
current device doze state, since the requesting app could get the
same behavior by starting their own foreground service.

Always dispatch network policy changes to ConnectivityService first
to ensure that it has up-to-date information.  Fix bugs around data
saver that were causing networks to not be marked as BLOCKED for
background apps; before this fix apps would have been spinning in
internal connectivity loops, thinking that the network was actually
connected when the kernel was actually blocking their traffic.

Offer new ConnectivityService method overloads to ignore the blocked
state for a specific UID.

Print unsatisfied job constraints to aid debugging.

Bug: 26571724
Change-Id: Iaaa17933e6dc1bf6d3dff26d0bfc12222e51e241
2016-04-29 13:44:07 -06:00
Android Build Merger (Role)
01c037a234 Merge "Merge "Stop user faster and clear stale broadcasts" into nyc-dev am: ec6faca007 am: 9dee0bccd8" into nyc-mr1-dev-plus-aosp 2016-04-29 00:59:33 +00:00
Amith Yamasani
3fd3ffcb20 Merge "Stop user faster and clear stale broadcasts" into nyc-dev am: ec6faca007
am: 9dee0bccd8

* commit '9dee0bccd8e692d1ca86bcf7180170f153dc99c7':
  Stop user faster and clear stale broadcasts

Change-Id: I16c4c1dfcff9f4d63da0444923a29fda0bea5ee8
2016-04-29 00:59:02 +00:00
Amith Yamasani
4f3e0055b1 Merge "Stop user faster and clear stale broadcasts" into nyc-dev am: ec6faca007
am: 390636bf45

* commit '390636bf45725f1180af69592694fe5552578fcb':
  Stop user faster and clear stale broadcasts

Change-Id: I423d1f8448f8ba5b54f90a2fa192f231f38b761c
2016-04-29 00:58:58 +00:00
Amith Yamasani
390636bf45 Merge "Stop user faster and clear stale broadcasts" into nyc-dev
am: ec6faca007

* commit 'ec6faca0078263dfbf2b41d11cdb14586e40fd75':
  Stop user faster and clear stale broadcasts

Change-Id: I36eeb177791730a26077542606559e3e4428b87e
2016-04-29 00:56:43 +00:00
Amith Yamasani
f786dbf65c Stop user faster and clear stale broadcasts
Moved several USER_STOPPING registered receivers to listen
to USER_STOPPED, since they don't need to be blocking the
shutdown of the user.

Clear all stale broadcasts when stopping a user, so that we
don't unnecessarily start up processes and deliver stale
broadcasts. This was causing code to run when the user was
already stopped and resulted in crashes when other providers
and services couldn't be started anymore. Hopefully this fixes
many of those races.

Bug: 28371487
Change-Id: Ic35a7a23fa8fe009a53f8bf7545d4dad5fa34134
2016-04-28 10:02:44 -07:00
TreeHugger Robot
5449c0b3e6 Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev am: eee5866
am: 4844eaf

* commit '4844eafcca60ca253c510714c7a348de45fba89b':
  Tethering and Data Saver: There Can Be Only One!

Change-Id: Idb0ab16443ca061f97ed2f12e0ee01d9fa61b187
2016-04-27 23:40:42 +00:00
Felipe Leme
4844eafcca Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev
am: eee5866

* commit 'eee58665f3732fb0b2fbf8a49f0d3df582d33ca4':
  Tethering and Data Saver: There Can Be Only One!

Change-Id: I876c9a30e9451b1c346296c233068bdfb579f584
2016-04-27 23:31:49 +00:00
TreeHugger Robot
eee58665f3 Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev 2016-04-27 22:41:13 +00:00
Android Build Merger (Role)
cb8494ca4e Merge "Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: f2f244a am: d00f83f" into nyc-mr1-dev-plus-aosp 2016-04-27 02:02:03 +00:00
TreeHugger Robot
cbc95c7b5c Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: f2f244a
am: d00f83f

* commit 'd00f83f56024ddcce1d42a03c6a27f317ccab7f3':
  Remove unused event tags of IpConnectivityEvent
  Better ConnectivityMetricsEvent printing

Change-Id: I7b9588ab0533963ed918ec8aee7ba7c4ec1dea0a
2016-04-27 02:01:14 +00:00
TreeHugger Robot
aa9e2ee4b6 Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: f2f244a
am: 27f44c4

* commit '27f44c4704b98bb969ab836a3cc30df75c1e626e':
  Remove unused event tags of IpConnectivityEvent
  Better ConnectivityMetricsEvent printing

Change-Id: I07a76836e84a71844332b387fef64511c01bf6bf
2016-04-27 02:01:11 +00:00
Hugo Benichi
27f44c4704 Merge changes I8de95add,Ia6f4ccfd into nyc-dev
am: f2f244a

* commit 'f2f244aa21b8d1f4d84973550c5e78a29fc42a24':
  Remove unused event tags of IpConnectivityEvent
  Better ConnectivityMetricsEvent printing

Change-Id: I57ce8977a481d3c9a441ea4dab407ec367e3adca
2016-04-27 01:57:13 +00:00