Commit Graph

2800 Commits

Author SHA1 Message Date
Tobias Thierer
12af1b2ee7 Merge \\\\"Changes for upgrade to OkHttp 2.7.5\\\\" am: 9ca932b06e am: 776136f77c am: 6b473f7b67
am: 17f75b01ef

Change-Id: I02fe28e773df3b328be8c7ea26b0df065014188a
2016-06-30 13:12:46 +00:00
Tobias Thierer
17f75b01ef Merge \\\"Changes for upgrade to OkHttp 2.7.5\\\" am: 9ca932b06e am: 776136f77c
am: 6b473f7b67

Change-Id: I3a0dc1da2ee96d71c38cab727141efcb686627e1
2016-06-30 13:04:52 +00:00
Tobias Thierer
776136f77c Merge \"Changes for upgrade to OkHttp 2.7.5\"
am: 9ca932b06e

Change-Id: Id79249756929a61dca374f9f1d43d0ea9e6b1280
2016-06-30 12:49:47 +00:00
Tobias Thierer
9ca932b06e Merge "Changes for upgrade to OkHttp 2.7.5" 2016-06-30 12:35:03 +00:00
Tobias Thierer
852f2e2ec0 Changes for upgrade to OkHttp 2.7.5
- Use com.android.okhttp.Dns in place of com.android.okhttp.internal.Network
 - Specify TimeUnit.MILLISECONDS for timeouts which 2.7.5 allows and
   brings us closer to 3+

Change-Id: I95b5d72a94ebe1389f7c2e8d95903aa1aadd944b
2016-06-29 17:41:32 +01:00
Hugo Benichi
1ce90f1b8c Adding tests for DnsEventListenerService am: c1aead00e7
am: 16e1a3a679

Change-Id: I70ac910d67a1e4a7c4f9f3d24f983dce99957151
2016-06-29 07:23:22 +00:00
Hugo Benichi
973cc38494 Refactor IP connectivity event logging am: 3bdc8357fe
am: 2229b20b34

Change-Id: If8775031f2a293e94e564dde502d0775d5808fe6
2016-06-29 07:23:19 +00:00
Hugo Benichi
16e1a3a679 Adding tests for DnsEventListenerService
am: c1aead00e7

Change-Id: I498ad1303ff3c0fbc4517203ff8e6b931814562b
2016-06-29 07:18:32 +00:00
Hugo Benichi
2229b20b34 Refactor IP connectivity event logging
am: 3bdc8357fe

Change-Id: I8de880edc4a8c7f12527218788cb44f263acb56f
2016-06-29 07:18:28 +00:00
Hugo Benichi
c1aead00e7 Adding tests for DnsEventListenerService
Bug: 29035129
Change-Id: Iaf0d9ec781da7a473b6f7d8623060ecde44b9cbd
2016-06-29 14:28:51 +09:00
Hugo Benichi
3bdc8357fe Refactor IP connectivity event logging
This patch removes static methods for logging IP connectivity events
defined in android.net.metrics and replaces them with a single log()
instance method defined on IpConnectivityLog. Event constructors are
now public also. Every classes logging such events now create an
instance of IpConnectivityLog for logging event objects directly
instantiated with new.

Removing static dependencies allow straightforward testing of logging.

This patch also removes the base IpConnectivityEvent class which is not
needed any more.

Bug: 29035129
Change-Id: I3de700f93f46deaa48a759f938f7d00e1d8bff98
2016-06-29 14:28:51 +09:00
Hugo Benichi
bb1c4b96c4 Merge \\"Fix unsafe concurrent access in LegacyTypeTracker\\" into nyc-mr1-dev am: 90b2c781ff
am: dd0d4300e5

Change-Id: I96d1c6fe08c17cf95056d445f6922b9f489021b9
2016-06-27 08:06:58 +00:00
Hugo Benichi
dd0d4300e5 Merge \"Fix unsafe concurrent access in LegacyTypeTracker\" into nyc-mr1-dev
am: 90b2c781ff

Change-Id: I6af8e185a165009f2b7b6efef764c883488bd7bf
2016-06-27 08:02:44 +00:00
Hugo Benichi
9c807fdcd4 Fix unsafe concurrent access in LegacyTypeTracker
This patch adds synchronization inside LegacyTypeTracker so that
getNetworkForType() can safely run concurrently with remove().

Without synchronization if remove() removes the last network for a
given type while getNetworkForType() runs for the same type, it is
possible that getNetworkForType tries to access the head of an empty
list, resulting in a runtime exception.

This issue was found by zoran.jovanovic@sonymobile.com who proposed a
fix in AOSP (Change-Id: Ia963662edb9d643790e8d9439e4dbdcac4c2187b).

This patch differs from the fix proposed by the bug reporter and tries
instead to do the minimum amount of locking to make getNetworkForType
safe.

Bug: 29030387
Change-Id: I915aac527fc8828b32bf35fee870add2dfb11d8d
2016-06-27 15:04:27 +09:00
Felipe Leme
1658fa81a7 Merge \"Merge \\"resolve merge conflicts of fa2715e to nyc-mr1-dev\\" into nyc-mr1-dev am: 10973455bc\" into nyc-mr1-dev-plus-aosp
am: 2ee4519a26

Change-Id: I8f54f9f8d3faee5a1ee3c77f04486869d5936610
2016-06-22 00:55:00 +00:00
Felipe Leme
f4813e82e3 Merge \"resolve merge conflicts of fa2715e to nyc-mr1-dev\" into nyc-mr1-dev
am: 10973455bc

Change-Id: I45cac1ca8a06196b61379cd86d6ac248bfa5d6b4
2016-06-21 23:49:22 +00:00
Felipe Leme
be93c8292a resolve merge conflicts of c65d475 to nyc-mr1-dev-plus-aosp
am: 632e3ab174

Change-Id: Ic5a8d119a95930feaf406bca83ee4a4f591675f8
2016-06-21 21:35:16 +00:00
Felipe Leme
632e3ab174 resolve merge conflicts of c65d475 to nyc-mr1-dev-plus-aosp
Change-Id: Ic75a6926e4bd2b8199e4feb7af315e84659d03a2
2016-06-21 13:41:22 -07:00
Felipe Leme
7d0177d5d7 resolve merge conflicts of fa2715e to nyc-mr1-dev
Change-Id: If0a1e7e70aa33e99f05694a37c2a54c567449507
2016-06-21 13:12:53 -07:00
Felipe Leme
c65d475906 Merge \"Ignore system apps on enforceMeteredApnPolicy().\" into nyc-dev
am: fa2715e03b

Change-Id: I98440b2ae3371661ed8b1b2f29b0ba18e1b6e6c3
2016-06-21 19:59:53 +00:00
Felipe Leme
ff76014fe8 Ignore system apps on enforceMeteredApnPolicy().
BUG: 29514913
Fixes: 29448383
Change-Id: I19eb004c937e1c872bbf82caa7a919e43d48a259
2016-06-20 17:15:46 -07:00
Robin Lee
c45962a9c5 Merge \\\"Move \\\'is already always-on\\\' check into Vpn.java\\\" into nyc-dev am: 6a58c98cef am: f062d0b193
am: 7b8d82484a

Change-Id: I245d528bc6653d52de944732fceccb3c1d542c3c
2016-06-16 10:26:41 +00:00
Robin Lee
7b8d82484a Merge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am: 6a58c98cef
am: f062d0b193

Change-Id: I12cdcac2581a062313dfc0c854a184485f5fc718
2016-06-16 10:21:39 +00:00
Robin Lee
b392fc54f5 Merge \\\"Move \\\'is already always-on\\\' check into Vpn.java\\\" into nyc-dev am: 6a58c98cef am: b4f3bf969d
am: f99a160ca1

Change-Id: I525ebc4b6c27eff17ff57fac7f664c221cbc2954
2016-06-16 10:18:43 +00:00
Robin Lee
f99a160ca1 Merge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am: 6a58c98cef
am: b4f3bf969d

Change-Id: I897c48083f8e6786182d023c58f9861996c6d25c
2016-06-16 10:14:06 +00:00
Robin Lee
f062d0b193 Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
am: 6a58c98cef

Change-Id: I6532f2e654cfd9df8ee6c649344b0b915a8381c1
2016-06-16 10:10:23 +00:00
Robin Lee
b4f3bf969d Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
am: 6a58c98cef

Change-Id: Id363cef8369d63ce4739089d94139e34ed25f665
2016-06-16 10:10:23 +00:00
Robin Lee
6a58c98cef Merge "Move 'is already always-on' check into Vpn.java" into nyc-dev 2016-06-16 10:06:11 +00:00
Robin Lee
a4325d282c Move 'is already always-on' check into Vpn.java
It's with the rest of the logic now and allows checking whether the
lockdown state matches, too, which led to a lot of misunderstandings.

Fix: 29199431
Change-Id: I94a2c38c4837f9c33b5b9c2becb52eeb7e2a2534
2016-06-14 13:24:17 +00:00
Paul Jensen
71fd4d1126 Merge \\\"Show sign-in to network notification to all users, not just owner.\\\" into nyc-dev am: 634bd0eb4e am: 601f877903
am: 7bf7ae573c

Change-Id: I25f18dc05e54b605316bee49693f390c356c7ba2
2016-06-14 11:30:35 +00:00
Paul Jensen
68646c4676 Merge \\\"Show sign-in to network notification to all users, not just owner.\\\" into nyc-dev am: 634bd0eb4e am: 6715499061
am: 7a68a26148

Change-Id: I3895d869e5b881b82310a4efc235f41f1176d44c
2016-06-14 11:25:41 +00:00
Paul Jensen
7bf7ae573c Merge \\"Show sign-in to network notification to all users, not just owner.\\" into nyc-dev am: 634bd0eb4e
am: 601f877903

Change-Id: Iead63295514f72cd588259f82ac44c98c54ac883
2016-06-14 11:24:57 +00:00
Paul Jensen
7a68a26148 Merge \\"Show sign-in to network notification to all users, not just owner.\\" into nyc-dev am: 634bd0eb4e
am: 6715499061

Change-Id: I82726a61541da890dea12448b2823f3dd7e367d2
2016-06-14 11:21:12 +00:00
Paul Jensen
601f877903 Merge \"Show sign-in to network notification to all users, not just owner.\" into nyc-dev
am: 634bd0eb4e

Change-Id: Ic8f99cb7c7fa7ed1f40c73342840f82c56f9f90f
2016-06-14 11:16:15 +00:00
Paul Jensen
6715499061 Merge \"Show sign-in to network notification to all users, not just owner.\" into nyc-dev
am: 634bd0eb4e

Change-Id: I4522f765c6166bd1c8216088b1605eac4c69d869
2016-06-14 11:16:12 +00:00
Paul Jensen
634bd0eb4e Merge "Show sign-in to network notification to all users, not just owner." into nyc-dev 2016-06-14 11:05:32 +00:00
Paul Jensen
efffb79661 Show sign-in to network notification to all users, not just owner.
All users should be made aware a captive portal is in place and be
given the opportunity to sign into the network.  Without this fix
other users are not notified and given a chance to sign-in.

Change-Id: I1bf823d5f6a36f391dca4be5f6a584e8562a72a7
Fixes: 23079964
2016-06-13 09:39:28 -04:00
Robin Lee
89c239acf1 Merge \\\"Package changed/removed listeners for always-on VPN\\\" into nyc-dev am: ee5e4cc836 am: f187518b18
am: 352ca4e0ef

Change-Id: Id5c8f01aed82b5f8e3a9b0df23999240ba07ee98
2016-06-08 11:06:41 +00:00
Robin Lee
114c6d7a71 Merge \\\"Package changed/removed listeners for always-on VPN\\\" into nyc-dev am: ee5e4cc836 am: 198d78012d
am: 0e79a48a5f

Change-Id: Id82a70970cdd7b5750b1727bbad91e4dce6da703
2016-06-08 11:00:30 +00:00
Robin Lee
352ca4e0ef Merge \\"Package changed/removed listeners for always-on VPN\\" into nyc-dev am: ee5e4cc836
am: f187518b18

Change-Id: I69ddb790aac005bd55f11d2a371d992311443a5f
2016-06-08 10:57:22 +00:00
Robin Lee
0e79a48a5f Merge \\"Package changed/removed listeners for always-on VPN\\" into nyc-dev am: ee5e4cc836
am: 198d78012d

Change-Id: I64ab86a9133d524865bed8c7824634e0539c1212
2016-06-08 10:54:52 +00:00
Robin Lee
f187518b18 Merge \"Package changed/removed listeners for always-on VPN\" into nyc-dev
am: ee5e4cc836

Change-Id: Idd2e019feb73bd580aa7d8baba03c27083e26b02
2016-06-08 10:50:43 +00:00
Robin Lee
198d78012d Merge \"Package changed/removed listeners for always-on VPN\" into nyc-dev
am: ee5e4cc836

Change-Id: I8f7054b5a2ac69677a0e124e9a616b3d58b604af
2016-06-08 10:50:42 +00:00
Lorenzo Colitti
56b6a0b630 Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev am: ec79b10313
am: e9aac55615

Change-Id: I776625bbc557c747477db70235847dd8b3ab8baf
2016-06-08 06:44:24 +00:00
Lorenzo Colitti
e9aac55615 Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
am: ec79b10313

Change-Id: I2305c4019f56896d741caa509df41416368e5642
2016-06-08 06:39:18 +00:00
TreeHugger Robot
ec79b10313 Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
* changes:
  Give WakeupMessage the ability to transport an object as well.
  Don't treat the lingerExpired broadcast specially.
  Add a test for mobile data always on.
  Add a FakeSettingsProvider and use it in ConnectivityServiceTest.
2016-06-08 06:35:32 +00:00
Lorenzo Colitti
e4af175185 Don't treat the lingerExpired broadcast specially.
NetworkMonitor no longer uses the broadcast for lingering, it
uses WakeupMessage instead.

Bug: 23113288
Change-Id: Idb0c55fc68cb8f45b3213c7134213904f227852e
2016-06-08 14:09:07 +09:00
Lorenzo Colitti
6caa9fe143 Add a test for mobile data always on.
Bug: 23113288
Change-Id: Ia8649061a797367d135bb5576600a7cdc85a822e
2016-06-08 14:08:59 +09:00
Lorenzo Colitti
8a35028afb Add a FakeSettingsProvider and use it in ConnectivityServiceTest.
This class makes it easier to test code that uses Settings:

1. Real device or emulator settings don't affect the code under
   test; all settings always start off empty.
2. It's possible to change settings from the test without
   affecting system settings.
3. No changes are needed to the code under test. The changes to
   the tests are simple: just add a fake ContentResolver to
   whatever mock Context is already used by the test, and make
   that ContentResolver use the fake provider.

Bug: 23113288
Change-Id: I5e7e5a87571444ae49ccf551705620675a36cd17
2016-06-08 14:05:55 +09:00
Robin Lee
2073a5c734 Package changed/removed listeners for always-on VPN
Fix 2 problems of always-on vpn after always-on package is removed
1. Prevent network being locked down (blocking all network traffic)
   Otherwise, user has no way to download the vpn app from Play Store,
   and never be able to gain control of the network again.
2. Allow user to connect other vpn app.

Implementation
1. Switch off always-on mode if the package gets removed.
2. Restart always-on mode if the package gets replaced/upgraded.

Bug: 29050764
Change-Id: Id3e389ae0b11c6002a5167919292d9634c2014cb
2016-06-06 15:42:50 +00:00