Commit Graph

2924 Commits

Author SHA1 Message Date
Felipe Leme
afbeac90aa 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
9bec9a4c97 resolve merge conflicts of fb043bd to nyc-mr1-dev-plus-aosp
Change-Id: Ic75a6926e4bd2b8199e4feb7af315e84659d03a2
2016-06-21 13:41:22 -07:00
Felipe Leme
22bac76a06 resolve merge conflicts of fa2715e to nyc-mr1-dev
Change-Id: If0a1e7e70aa33e99f05694a37c2a54c567449507
2016-06-21 13:12:53 -07:00
Felipe Leme
fb043bd185 Merge \"Ignore system apps on enforceMeteredApnPolicy().\" into nyc-dev
am: fa2715e03b

Change-Id: I98440b2ae3371661ed8b1b2f29b0ba18e1b6e6c3
2016-06-21 19:59:53 +00:00
Felipe Leme
0a5ae42e45 Ignore system apps on enforceMeteredApnPolicy().
BUG: 29514913
Fixes: 29448383
Change-Id: I19eb004c937e1c872bbf82caa7a919e43d48a259
2016-06-20 17:15:46 -07:00
Robin Lee
9331ccf0d8 Merge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am: c32921dcda
am: f2235f1a75

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

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

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

Change-Id: Id363cef8369d63ce4739089d94139e34ed25f665
2016-06-16 10:10:23 +00:00
Robin Lee
c32921dcda Merge "Move 'is already always-on' check into Vpn.java" into nyc-dev 2016-06-16 10:06:11 +00:00
Robin Lee
8631caa822 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
e8da6a1991 Merge \\"Show sign-in to network notification to all users, not just owner.\\" into nyc-dev am: fa7453ed47
am: 2b90b80a81

Change-Id: Iead63295514f72cd588259f82ac44c98c54ac883
2016-06-14 11:24:57 +00:00
Paul Jensen
58fa621af2 Merge \\"Show sign-in to network notification to all users, not just owner.\\" into nyc-dev am: fa7453ed47
am: 3ed407344a

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

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

Change-Id: I4522f765c6166bd1c8216088b1605eac4c69d869
2016-06-14 11:16:12 +00:00
Paul Jensen
fa7453ed47 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
b31cfb423c 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
ba3ee4395e Merge \\"Package changed/removed listeners for always-on VPN\\" into nyc-dev am: ee5e4cc836
am: 567d4aed3b

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

Change-Id: I64ab86a9133d524865bed8c7824634e0539c1212
2016-06-08 10:54:52 +00:00
Robin Lee
567d4aed3b 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
a21c500b58 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
9deb2c2d0d Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
am: c5447626d7

Change-Id: I2305c4019f56896d741caa509df41416368e5642
2016-06-08 06:39:18 +00:00
TreeHugger Robot
c5447626d7 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
e9a96608a9 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
9fc66e020a Add a test for mobile data always on.
Bug: 23113288
Change-Id: Ia8649061a797367d135bb5576600a7cdc85a822e
2016-06-08 14:08:59 +09:00
Lorenzo Colitti
72d0da9899 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
1a0a77ba10 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
Android Build Merger (Role)
f307ccbbc1 Merge "Merge "Include network name in validation logs for dumpsys" into nyc-dev am: 716fa18dcb am: ff71246e0d" into nyc-mr1-dev-plus-aosp 2016-06-06 11:34:40 +00:00
Paul Jensen
71606e90ca Merge "Include network name in validation logs for dumpsys" into nyc-dev am: 716fa18dcb
am: ff71246e0d

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

Change-Id: Ie6778a47bab7e52795684d46672e42630c192d64
2016-06-06 11:34:10 +00:00
Paul Jensen
0dc8a9b393 Merge "Include network name in validation logs for dumpsys" into nyc-dev am: 716fa18dcb
am: 1209aef1ad

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

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

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

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

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

Change-Id: Ic5345cb7f309e509c7b9d7cb7b7ec4b95b8f1102
2016-06-06 11:23:51 +00:00
Paul Jensen
716fa18dcb Merge "Include network name in validation logs for dumpsys" into nyc-dev 2016-06-06 11:08:45 +00:00
Android Build Merger (Role)
ca7e5f5ce6 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: 508eec87ac" into nyc-mr1-dev-plus-aosp 2016-06-06 10:44:21 +00:00
Robin Lee
d9a3b6459d Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee
am: 508eec87ac

* commit '508eec87acc1867f7606d56f872d85662ec56a57':
  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
a8ca6d9662 Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee
am: 3e9051602c

* commit '3e9051602cae0b19fc679e65f79786240d6a60c0':
  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
3e9051602c 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
508eec87ac 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
fionaxu
dc9ff70da1 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
5310c30967 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
5912c7b350 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
a81567b746 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
Android Build Merger (Role)
57fba6df50 Merge "Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 4fb4490dfb am: 624febb525" into nyc-mr1-dev-plus-aosp 2016-05-25 21:29:56 +00:00
Robin Lee
3b693c82ad Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 4fb4490dfb
am: ef7e644fc5

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

Change-Id: I74b7cb240b959a8c67b8967b4a78338eb80f6a81
2016-05-25 21:28:27 +00:00
Robin Lee
a13e0c5aa6 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 4fb4490dfb
am: 624febb525

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

Change-Id: Icc8867a0ea3024c189aff10e2b903fac0dab2092
2016-05-25 21:28:21 +00:00
Robin Lee
624febb525 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
am: 4fb4490dfb

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

Change-Id: I89c0784d5edae3c7ef9f8ec1c6ee4f823dbbae02
2016-05-25 21:20:43 +00:00
Robin Lee
4fb4490dfb Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev 2016-05-25 21:05:55 +00:00
Jeff Sharkey
8e401c2437 Merge "API council feedback: hide and document." into nyc-dev am: 3e0e975a38
am: 8d5d9a0ff4

* commit '8d5d9a0ff46f4d9260eaeeb8534d0dff8139730f':

Change-Id: I6ffe0cc7ade34b0b87c37749b387d1810770adce
2016-05-25 21:01:32 +00:00
Jeff Sharkey
dfd98ed300 Merge "API council feedback: hide and document." into nyc-dev am: 3e0e975a38
am: 19e2f49181

* commit '19e2f49181b209d790f551b374d6d24002de7c9b':
  API council feedback: hide and document.

Change-Id: I3715fc6e824f2a55517788299afe36145db597d7
2016-05-25 20:54:18 +00:00
Jeff Sharkey
8d5d9a0ff4 Merge "API council feedback: hide and document." into nyc-dev
am: 3e0e975a38

* commit '3e0e975a38688b4d5dbc96830788df00499fc01b':
  API council feedback: hide and document.

Change-Id: I180f504fe21f6f90179d359e8808ffff006e4538
2016-05-25 20:51:03 +00:00