Commit Graph

2965 Commits

Author SHA1 Message Date
Lorenzo Colitti
f2b4b3e4e7 Add a background NetworkRequest type for mobile data always on. am: 2666be8ae7 am: 9396da4e10
am: 350a2fef4a

Change-Id: I9e11b75fe0af8a116593394b151c7fb4d1e167f8
2016-09-14 05:02:12 +00:00
Lorenzo Colitti
31fc3195fb Rematch requests first and listens second. am: 0c38d7c8cd am: 836a5db809
am: 1506251e93

Change-Id: I87d20179025aabc44cb5b2e51f3dcb960b042c50
2016-09-14 05:00:13 +00:00
Lorenzo Colitti
620562c61c Add test coverage for background networks. am: d8a23ad61f
am: 815bbf5678

Change-Id: Ib73537c95107b1b8d0a223abc053794ad24fcbf5
2016-09-14 03:29:48 +00:00
Lorenzo Colitti
aabaa907de Add a NET_CAPABILITY_FOREGROUND capability. am: 0f04220ffe
am: aaec66110d

Change-Id: I78d6aa21f8e4c6bbd9cefb4a36f1b77f4bbe4104
2016-09-13 16:23:10 +00:00
Lorenzo Colitti
d8a23ad61f Add test coverage for background networks.
Bug: 23113288
Change-Id: Idad62f5f025825f99007ccf7b20f530dc3cf6daa
2016-09-13 12:02:13 +09:00
Lorenzo Colitti
0f04220ffe Add a NET_CAPABILITY_FOREGROUND capability.
Bug: 23113288
Change-Id: I90cb9ffb5751f0d9ec822933f37680c401e49966
2016-09-13 12:02:13 +09:00
Lorenzo Colitti
350a2fef4a Add a background NetworkRequest type for mobile data always on. am: 2666be8ae7
am: 9396da4e10

Change-Id: I4b0e05e8bb87e37bf2564fd255b8be7a2b20118a
2016-09-12 13:48:53 +00:00
Lorenzo Colitti
1506251e93 Rematch requests first and listens second. am: 0c38d7c8cd
am: 836a5db809

Change-Id: Ia57cd548b2920efaee733f5cb0df66139a6e55e6
2016-09-12 13:46:48 +00:00
Lorenzo Colitti
2666be8ae7 Add a background NetworkRequest type for mobile data always on.
Like a normal (foreground) request, a background request is only
satisfied by one network and will keep that network up. Unlike a
foreground request, when a network only has background requests,
it will linger, and after lingering is complete, it will become
a background network.

Future CLs will cause the system to treat background networks
differently, e.g., by requiring different permissions.

Bug: 23113288
Change-Id: I40f735269dad1042eb04fea15e64584fc903ccb3
2016-09-09 18:49:24 +09:00
Lorenzo Colitti
0c38d7c8cd Rematch requests first and listens second.
This CL splits rematching in two parts: first rematch requests,
then rematch listens. This will allow us to change a network's
capabilities depending on what requests are on that network, and
properly dispatch callbacks depending on those capabilities.

The behaviour changes are as follows:

- Before this CL, callbacks for requests and listens were sent
  intermingled. After this CL, all request callbacks will be
  grouped together, and all listen callbacks will be grouped
  together.
- Before this CL, the order was:
    1. Send onLost callbacks.
    2. If applicable, switch the default network.
    3. Send onAvailable callbacks.
  After this CL, the order is:
    1. Send onLost callbacks for requests.
    2. If applicable, switch the default network.
    3. Send onLost callbacks for listens.
    4. Send onAvailable callbacks for listens.
    5. Send onAvailable callbacks for requests.

These changes shouldn't affect any apps because:

1. The order of callbacks continues to be first all onLost,
   then all onAvailable.
2. Both the old and the new code send callbacks in no particular
   order. Thus, the possible ordering combinations of callbacks
   in the new code are a strict subset of the possible ordering
   combinations of the old code.
3. The default network is switched before any onAvailable
   callback is sent.
4. Even though the new code does not send all onLost callbacks
   before switching the default network, even before this CL
   there was no guarantee that those callbacks would be received
   before the default network switch anyway, because callbacks
   are asynchronous.

Bug: 23113288
Change-Id: Ia08900c50db9ff43895047e2f4f36b6c6c31a1f9
2016-09-09 18:28:00 +09:00
TreeHugger Robot
8badb5756f Merge "Refactored INetworkPolicyListener callbacks." 2016-09-07 17:42:27 +00:00
Etan Cohen
1139704122 [NAN] Add transport type for NAN. [DO NOT MERGE] am: e7395027cf -s ours am: e3efe944fd -s ours am: 0890f0175a
am: 4ba6a728a7  -s ours

Change-Id: Ied593d01655d3b39dfff52990f209bf3179f5be7
2016-09-07 04:42:56 +00:00
Etan Cohen
4ba6a728a7 [NAN] Add transport type for NAN. [DO NOT MERGE] am: e7395027cf -s ours am: e3efe944fd -s ours
am: 0890f0175a

Change-Id: Ie40c480b45fcb5a660335eb42a71afcf8a8cebb5
2016-09-07 04:38:37 +00:00
Etan Cohen
0890f0175a [NAN] Add transport type for NAN. [DO NOT MERGE] am: e7395027cf -s ours
am: e3efe944fd  -s ours

Change-Id: I439ed5ac5b70f6e693a441d8b6000f208351a3f7
2016-09-07 04:33:21 +00:00
Etan Cohen
e7395027cf [NAN] Add transport type for NAN. [DO NOT MERGE]
Add TRANSPORT_WIFI_NAN - specifies a peer-to-peer Wi-Fi NAN data
connectivity request.

While NAN uses Wi-Fi L1 PHY and part of the MAC - it is a different
protocol and constitutes a different transport.

(cherry-pick of commit 7473bc20ad)

Bug: 26564277
Change-Id: I975ebc72d8f97a592d18038b3d6465b7a40efa75
2016-09-06 15:54:10 -07:00
Felipe Leme
3d417283a9 Refactored INetworkPolicyListener callbacks.
Methods onRestrictBackgroundWhitelistChanged() and
onRestrictBackgroundBlacklistChanged() were replaced by a more generic
onUidPoliciesChanged().

Test: m javac-check RUN_ERROR_PRONE=true
Test: m -j32 FrameworksServicesTests && adb install -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && adb shell am instrument -e class "com.android.server.NetworkPolicyManagerServiceTest" -w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

BUG: 28791717
Change-Id: I18b2ee4af06802e0d23822b153d1be9b429d5811
2016-09-06 12:49:48 -07:00
Lorenzo Colitti
34de7a3e55 Network switch notifications: rate & daily limits am: 9bf6fef270 am: 858499b2c0 am: 2c535a4f7c
am: e6c813b201

Change-Id: I0c067ec355eb2a50af3c828b1fe3ee8a78e44536
2016-08-31 23:31:56 +00:00
Hugo Benichi
6d2cb61e35 Network Switching Notifications: add unit tests am: 01f7228f5c am: 56f1281888 am: cf5f5785c9
am: 7ded0138f0

Change-Id: Idf4986df6f0f2b232aeaa5e43feb51615089dc71
2016-08-31 23:30:34 +00:00
Lorenzo Colitti
ff6b602a75 Don't notify on network switch if source network is validated. am: fde640e59d am: b301283d57 am: a0a41b1e3d
am: bed9b4583d

Change-Id: I150cbafb6ab3fce4800241bfacec4bf4ee73db31
2016-08-31 22:40:41 +00:00
Lorenzo Colitti
e6c813b201 Network switch notifications: rate & daily limits am: 9bf6fef270 am: 858499b2c0
am: 2c535a4f7c

Change-Id: I166dd693345ed9a63411f5f1ed6bdf33015b1957
2016-08-30 20:32:52 +00:00
Hugo Benichi
7ded0138f0 Network Switching Notifications: add unit tests am: 01f7228f5c am: 56f1281888
am: cf5f5785c9

Change-Id: I978e49ba1302ca3d791c59555b5a143cefb62c06
2016-08-30 20:31:34 +00:00
Lorenzo Colitti
9bf6fef270 Network switch notifications: rate & daily limits
This patch adds a daily limit to the maximum number of notifications
shown when switching networks.

It also adds a rate limit to prevent rapid successive notifications in
flapping scenarios.

Bug: 31132499
Change-Id: Iccb6d0899646ea6df3cfad32a421922263e0eb85
2016-08-31 00:36:11 +09:00
Hugo Benichi
01f7228f5c Network Switching Notifications: add unit tests
BUG: 31132499
Change-Id: I9c50a59fe48efdcb51d2517f0a756691700c3ebe
2016-08-31 00:35:16 +09:00
Lorenzo Colitti
bed9b4583d Don't notify on network switch if source network is validated. am: fde640e59d am: b301283d57
am: a0a41b1e3d

Change-Id: I047a0040798223c163d333996e6bc06e206129a0
2016-08-30 11:02:33 +00:00
Lorenzo Colitti
fde640e59d Don't notify on network switch if source network is validated.
Sometimes we switch away from a network to another (e.g., wifi to
cell data) not because the old network is unvalidated, but
because the score is lowered by a low signal strength.

In this case, don't notify the user of a network switch.

Bug: 31132499
Change-Id: I996a6e00096f8cb864fa9b00b36921725a4edb53
2016-08-29 16:30:21 +09:00
Lorenzo Colitti
4f1ea3a36b Support notifying network switches via notifications and toasts. am: ddc5fd88fe am: 4549d8b4aa am: 10acdf7ad1
am: 6881182916

Change-Id: Ic2031d00a24a6fd7ad1969a962360920fac9afd1
2016-08-26 22:21:10 +00:00
Lorenzo Colitti
6881182916 Support notifying network switches via notifications and toasts. am: ddc5fd88fe am: 4549d8b4aa
am: 10acdf7ad1

Change-Id: I0324cfdb7c070464c2caa73fa5fad8d1031c1e76
2016-08-25 09:36:13 +00:00
Lorenzo Colitti
ddc5fd88fe Support notifying network switches via notifications and toasts.
Bug: 31025214
Change-Id: If1578f422f38a1dcfaec529882aed01ae5e8d53c
2016-08-25 18:14:18 +09:00
Lorenzo Colitti
fe48243627 Refactor NetworkNotificationManager. am: c5391028ec am: a6dcb89e6d am: 4e0916b416
am: 2f063e3065

Change-Id: I1249d019ce449f8721541c138f89b98230a67b57
2016-08-23 18:34:58 +00:00
Lorenzo Colitti
da9b26fccf Move notification code out of ConnectivityService. am: 74c205f5ea am: 622b5fbbf5 am: 28707247f4
am: e207b2703b

Change-Id: I4263c2051e654588dab98e53e3015e59576fb987
2016-08-23 18:34:18 +00:00
Lorenzo Colitti
2f063e3065 Refactor NetworkNotificationManager. am: c5391028ec am: a6dcb89e6d
am: 4e0916b416

Change-Id: I548b311ab8dc1d7e08f17a6b31573262c8a4518e
2016-08-23 17:21:39 +00:00
Lorenzo Colitti
e207b2703b Move notification code out of ConnectivityService. am: 74c205f5ea am: 622b5fbbf5
am: 28707247f4

Change-Id: I6e3290891f322c1caca3ff70a3aa39dd140d6256
2016-08-23 17:20:59 +00:00
Lorenzo Colitti
c5391028ec Refactor NetworkNotificationManager.
1. Move from deprecated network types to transport types.
2. Rename and simplify (by passing in a NetworkAgentInfo object)
   the call signature of the method that displays notifications.
3. Add a method to clear notification, and unindent lots of code.
4. Move the legacy DcTracker-issued notification code to
   NetworkNotificationManager.

Bug: 31025214
Change-Id: Ie49c60126d0ed5bac620bc47e84fe038791b2d6c
2016-08-23 17:57:46 +09:00
Lorenzo Colitti
74c205f5ea Move notification code out of ConnectivityService.
Bug: 31025214
Change-Id: I4190be6b57f92298b79bea8868f1876ecbfd2d75
2016-08-23 15:31:59 +09:00
TreeHugger Robot
f9e188bc2a Merge "Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock." 2016-08-22 21:46:29 +00:00
Felipe Leme
de2a6f1b1d Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
Test: m -j32 FrameworksServicesTests && adb install -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && adb shell am instrument -e class "com.android.server.net.NetworkStatsServiceTest" -w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

BUG: 30943463
Change-Id: I3fbdb0918f1d0e68f32afe07ca38d4ef217025df
2016-08-22 13:14:21 -07:00
Felipe Leme
a4dc2a7129 Use @Ignore to explicitly disable a @Test method.
BUG: 30839080
BUG: 31007021
Change-Id: Ia93f6b3c8fd1d2d2826c3b04b05f66339672a7e6
2016-08-22 09:02:12 -07:00
Felipe Leme
f96df4b298 Fixed NetworkStatsServiceTest and converted it to JUnit4.
Most tests were failing because due to a null NetworkCapabilities.
Example:

1) testNetworkStatsWifi(com.android.server.net.NetworkStatsServiceTest)
java.lang.NullPointerException: Attempt to invoke virtual method 'boolean android.net.NetworkCapabilities.hasCapability(int)' on a null object reference
	at
	com.android.server.net.NetworkStatsService.updateIfacesLocked(NetworkStatsService.java:983)

BUG: 30839080

Change-Id: Ib81d81df2828fc573c40b26c23af9d80ae43d3f6
2016-08-18 15:45:09 -07:00
Erik Kline
32b0ae8a0c Support timeouts for requestNetwork() invocations. [DO NOT MERGE]
am: 0b7a74842b  -s ours

Change-Id: Ia98ec84e1c9e691c58ebb79f516b62b229dda5fe
2016-08-17 17:51:52 +00:00
Etan Cohen
5716482c36 Merge "Support timeouts for requestNetwork() invocations." 2016-08-17 17:15:46 +00:00
Jeremy Joslin
13dd0e99ba VPN network stat accounting changes.
Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.

This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.

BUG: 30557871
Change-Id: I62a75a0c0c0111e052b7903baa9f5d6d94ef57fd
2016-08-16 15:53:57 -07:00
Erik Kline
155a59aa63 Support timeouts for requestNetwork() invocations.
(cherry-pick of 06c3ef1367e850746eef0a5462bdce8674d74c30)

Bug: 21414325
Change-Id: I08118be8e8cf92fc406d431e99a6c9191a863ff3
2016-08-15 10:19:45 -07:00
Erik Kline
0b7a74842b Support timeouts for requestNetwork() invocations. [DO NOT MERGE]
Bug: 21414325
Change-Id: I08118be8e8cf92fc406d431e99a6c9191a863ff3
2016-08-15 17:18:11 +00:00
Winson
80835c79bc Defaulting wallpaper offset to edge of the screen. am: 4b4ba90d66 am: 18faeaa5fa
am: ef248f8ab6

Change-Id: I86d0616df8f938b1b80651be83802796a24250b9
2016-07-31 02:12:44 +00:00
Hugo Benichi
ef248f8ab6 IpConnectivityMetrics: no metrics upload in tests am: 208c01039f
am: ae048d8363

Change-Id: I4171f72e27f39f2c10e4607b84934676337c1b4e
2016-07-29 09:34:35 +00:00
Hugo Benichi
208c01039f IpConnectivityMetrics: no metrics upload in tests
Similarly to ApfTest, this patch changes ConnectivityServiceTest to use
a mock object instead of IpConnectivityLog so that running
ConnectivityServiceTest does not generate android.net.metrics events.

Bug: 30450301
Change-Id: Ibc0479f381f26e60baefbae15407c62aecbf6666
2016-07-29 16:58:35 +09:00
Hugo Benichi
4e6a83b21e resolve merge conflicts of bd0cc76 to nyc-mr1-dev-plus-aosp
am: 145bbc680a

Change-Id: Ia0a4544784592ac857e5bd652fee47eec621f3a0
2016-07-26 15:18:51 +00:00
Hugo Benichi
145bbc680a resolve merge conflicts of bd0cc76 to nyc-mr1-dev-plus-aosp
Change-Id: Ib1c01241fece36f660d27f3450ba8059b3b2809f
2016-07-26 13:08:14 +09:00
Hugo Benichi
bd0cc763ae Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
This patch creates a new permission used by ConnectivityService to give
access to restricted networks without the NET_CAPABILITY_NOT_RESTRICTED
capability bit on.

Bug: 24497316
Change-Id: I5b6c8a9ef14395b2f1ab26cb17b24d7876ec79f1
2016-07-25 10:24:42 +09:00
Lorenzo Colitti
2f1d7cabed Merge \"Merge \\"Add an isListen method to NetworkRequests.\\" into nyc-mr1-dev am: b5239329b1\" into nyc-mr1-dev-plus-aosp
am: 17450e41b3

Change-Id: Ic71a5722ee877de73e7ffd340a5ffb84a2d4910d
2016-07-18 15:15:33 +00:00