Commit Graph

2776 Commits

Author SHA1 Message Date
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
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
Paul Jensen
5a385c32ee Merge "Merge "Include network name in validation logs for dumpsys" into nyc-dev am: daef5224d1 am: 1980eacf27" into nyc-mr1-dev-plus-aosp
am: bee9b094a7

* commit 'bee9b094a726b43cc825ff2f1ae6244c92debf9b':

Change-Id: Iaaedb0df6e1969e5960ffc54ffd364e9d8259504
2016-06-06 11:41:04 +00:00
Paul Jensen
af7e89e383 Merge "Include network name in validation logs for dumpsys" into nyc-dev am: daef5224d1 am: 8a3ecc71d8
am: fdcf429d27

* commit 'fdcf429d27b2027f0f5b67841cb053860fa57a68':
  Include network name in validation logs for dumpsys

Change-Id: If8d42bb7a355d1134ea24e4ad02acca1cd52e70c
2016-06-06 11:41:00 +00:00
Android Build Merger (Role)
bee9b094a7 Merge "Merge "Include network name in validation logs for dumpsys" into nyc-dev am: daef5224d1 am: 1980eacf27" into nyc-mr1-dev-plus-aosp 2016-06-06 11:34:40 +00:00
Paul Jensen
d7d41ff01d Merge "Include network name in validation logs for dumpsys" into nyc-dev am: daef5224d1
am: 1980eacf27

* commit '1980eacf27249b88f57f3b29ab45b3fc5069856e':
  Include network name in validation logs for dumpsys

Change-Id: Ie6778a47bab7e52795684d46672e42630c192d64
2016-06-06 11:34:10 +00:00
Paul Jensen
fdcf429d27 Merge "Include network name in validation logs for dumpsys" into nyc-dev am: daef5224d1
am: 8a3ecc71d8

* commit '8a3ecc71d8c0a96ec27479f79664ed550281ec33':
  Include network name in validation logs for dumpsys

Change-Id: I448ed66de8de6444f4506892fd3e8043f203cc11
2016-06-06 11:34:06 +00:00
Paul Jensen
1980eacf27 Merge "Include network name in validation logs for dumpsys" into nyc-dev
am: daef5224d1

* commit 'daef5224d1e8055f2a95650ef4139688976a05a7':
  Include network name in validation logs for dumpsys

Change-Id: I157481d338e65d7e89e4f97382f84ab2a3110e20
2016-06-06 11:23:57 +00:00
Paul Jensen
8a3ecc71d8 Merge "Include network name in validation logs for dumpsys" into nyc-dev
am: daef5224d1

* commit 'daef5224d1e8055f2a95650ef4139688976a05a7':
  Include network name in validation logs for dumpsys

Change-Id: Ic5345cb7f309e509c7b9d7cb7b7ec4b95b8f1102
2016-06-06 11:23:51 +00:00
Paul Jensen
daef5224d1 Merge "Include network name in validation logs for dumpsys" into nyc-dev 2016-06-06 11:08:45 +00:00
Robin Lee
15663a33c1 Merge "Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee am: 0ca903017c" into nyc-mr1-dev-plus-aosp
am: ebe9d7bf99

* commit 'ebe9d7bf99d0ad8289e9e29f07c0291f7b41432d':

Change-Id: I84476b69eac613027d239b9b07b639d071aa3e29
2016-06-06 10:51:32 +00:00
Victor Chang
37686a9c82 Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee am: 2360356d70
am: 684d7543bd

* commit '684d7543bd351860904b708bbdbf9a87cd27969a':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: I4641b2813820c82cc8509e0ba27f679733d45d6b
2016-06-06 10:51:29 +00:00
Android Build Merger (Role)
ebe9d7bf99 Merge "Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee am: 0ca903017c" into nyc-mr1-dev-plus-aosp 2016-06-06 10:44:21 +00:00
Robin Lee
79ccad47c2 Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee
am: 0ca903017c

* commit '0ca903017cb048a1a43a4253c3f3215f266dd56a':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: I676da29aa5322563b20a95afd504e3b4d68fd2a0
2016-06-06 10:43:54 +00:00
Robin Lee
684d7543bd Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee
am: 2360356d70

* commit '2360356d70f8cf127ab0590f699d7eb3038d1af3':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: I931c5d99282a6350e15aefbf400c90935237e679
2016-06-06 10:43:51 +00:00
Victor Chang
2360356d70 Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev
am: 265f4113ee

* commit '265f4113ee42e89f324b087a81044a9f1dab457e':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: Iba3df72496f067c5e0291449be3bfbd9ce2031ff
2016-06-06 10:33:00 +00:00
Victor Chang
0ca903017c Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev
am: 265f4113ee

* commit '265f4113ee42e89f324b087a81044a9f1dab457e':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: I86a8f5c9b2dbd8ea71bdc8fb6268f3d9dc7e329d
2016-06-06 10:30:42 +00:00
Chen Xu
3b6ee9a847 Merge "cold sim clean up" into nyc-mr1-dev am: ba3428f01b
am: a5011d73d6

* commit 'a5011d73d6e1c2cefc1d2d9702044be279210a9c':
  cold sim clean up

Change-Id: Ie35dd1dbede46a1ae6f6a1c902e8d54321325500
2016-06-04 05:58:44 +00:00
fionaxu
a5011d73d6 Merge "cold sim clean up" into nyc-mr1-dev
am: ba3428f01b

* commit 'ba3428f01b8cc112cd85d1c4ffcc1407a3b8b7c6':
  cold sim clean up

Change-Id: I5a2e24d997408badd6db7576b2fa206eb9e5c4ca
2016-06-04 05:53:44 +00:00
fionaxu
5447c49f01 cold sim clean up
- add a new field: provisioningNotificationEnabled from NetworkMisc. set
  to false if we want to hide "sign in" notification and placed
  carrier-specific notification instead. it is set on connect, once set,
  it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support

Bug: 28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85
2016-06-03 11:45:12 -07:00
Paul Jensen
72b24b1b5b Include network name in validation logs for dumpsys
Previously this was included in the log messages from NetworkMonitor
but that has been removed (ag/944107), making it frequently impossible
to know what network the logs apply to as there may be no way to
correlate NetIDs to WiFi SSIDs or Cellular networks if the log has wrapped.

Bug: 26075613
Change-Id: I2e3cd41fffb616ab9f855cb16790360bd3414793
2016-06-03 13:51:21 -04:00
Victor Chang
4754f8d47f Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on
Cause: It revoked the user consent of the vpn app without reseting always-on vpn.
In addition, prepareVpn sets legacy vpn as the current package, the state in
Vpn.class is broken, as it thought the current always-on package is legacy vpn,
(mAlwaysOn is only for app vpn, not for legacy vpn). As a result, prepareVpn rejects
all VpnService.prepare.

Bug: 29031820
Change-Id: Id6bf1d6f38cf134a872811806301b8a602fb5725
2016-06-03 17:14:32 +01:00
Robin Lee
3cd11ddf29 Merge "Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: ca9615bb20 am: b8a5f360e3" into nyc-mr1-dev-plus-aosp
am: 4803c6e5bf

* commit '4803c6e5bf6f2c8f7a9fb373e56a85aad6e9f34e':

Change-Id: Icfb0bcb2ec831c80303bc10747c84ebed606d607
2016-05-25 21:38:32 +00:00
Robin Lee
56649d3862 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: ca9615bb20 am: ef7e644fc5
am: 23e1419404

* commit '23e1419404e915a71c337da9ab1999c977b98d14':
  Return legacy VPN info regardless of lockdown mode

Change-Id: Ifff21798ff23d1906810d23393efc3e0cad14941
2016-05-25 21:37:36 +00:00
Android Build Merger (Role)
4803c6e5bf Merge "Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: ca9615bb20 am: b8a5f360e3" into nyc-mr1-dev-plus-aosp 2016-05-25 21:29:56 +00:00
Robin Lee
23e1419404 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: ca9615bb20
am: ef7e644fc5

* commit 'ef7e644fc5ce23768cf11c2b397c7938a0971992':
  Return legacy VPN info regardless of lockdown mode

Change-Id: I74b7cb240b959a8c67b8967b4a78338eb80f6a81
2016-05-25 21:28:27 +00:00