Commit Graph

2644 Commits

Author SHA1 Message Date
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
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
daef5224d1 Merge "Include network name in validation logs for dumpsys" into nyc-dev 2016-06-06 11:08:45 +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
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
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
Robin Lee
085a70d3f9 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: ca9615bb20
am: b8a5f360e3

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

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

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

Change-Id: I89c0784d5edae3c7ef9f8ec1c6ee4f823dbbae02
2016-05-25 21:20:43 +00:00
Robin Lee
ca9615bb20 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev 2016-05-25 21:05:55 +00:00
Jeff Sharkey
4b95090f82 Merge "API council feedback: hide and document." into nyc-dev am: d28e2363ed
am: 38af2337be

* commit '38af2337beaa770f8fbf858d416889ce7782eeda':

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

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

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

* commit 'd28e2363ed7c0d651f82c764328cea373920d906':
  API council feedback: hide and document.

Change-Id: I180f504fe21f6f90179d359e8808ffff006e4538
2016-05-25 20:51:03 +00:00
TreeHugger Robot
d28e2363ed Merge "API council feedback: hide and document." into nyc-dev 2016-05-25 20:43:56 +00:00
Android Build Merger (Role)
9d254e9189 Merge "Merge "Fix default network transition event recording" into nyc-dev am: 3cd6a8b85d am: 6a63f7b496" into nyc-mr1-dev-plus-aosp 2016-05-25 03:38:16 +00:00
Hugo Benichi
cf1e4bd061 Merge "Fix default network transition event recording" into nyc-dev am: 3cd6a8b85d
am: 6a63f7b496

* commit '6a63f7b49651adb2a45c1c089e0ac06cc1f4158e':
  Fix default network transition event recording

Change-Id: I94e4ff336a8102f4bc0e19acb705ba4838a1f17a
2016-05-25 03:37:22 +00:00
Hugo Benichi
1cb5371d88 Merge "Fix default network transition event recording" into nyc-dev am: 3cd6a8b85d
am: 86d587563a

* commit '86d587563a070ceb7b0d50c79cb961df61d922aa':
  Fix default network transition event recording

Change-Id: Ife822c39d617f89dde4cda5f2137b80425fe89ad
2016-05-25 03:37:19 +00:00
Hugo Benichi
86d587563a Merge "Fix default network transition event recording" into nyc-dev
am: 3cd6a8b85d

* commit '3cd6a8b85d48752ac4378cf0515dd5892f5dd214':
  Fix default network transition event recording

Change-Id: Ic6ae9cd2620b1793f53667eb7d84c0b6f56d716e
2016-05-25 03:31:34 +00:00
Hugo Benichi
3cd6a8b85d Merge "Fix default network transition event recording" into nyc-dev 2016-05-25 03:22:32 +00:00
Hugo Benichi
3f34b66e47 Fix default network transition event recording
When disconnecting from a default network X and falling back on another
connected network Y as the new default, ConnectivityService was
attempting to record this event as a X -> Y "atomic" transition.

In practice the default network connectivity is actually lost and
recovering default network takes some non-zero time.

This patch changes the event recording to always record disconnection as
X -> 0 events. At the same time, if there is a fallback network that is
elected as the new default ConnectivityService will also record a 0 -> Y
event.

This patch also improves pretty-printing of DefaultNetworkEvent.

Extract from $ adb shell dumpsys connectivity_metrics_logger --events
17:51:00.086: DefaultNetworkEvent(0 -> 100:CELLULAR)
17:51:25.232: DefaultNetworkEvent(100:IPv4 -> 101:WIFI) # wifi goes on
17:51:44.064: DefaultNetworkEvent(101:DUAL -> 0)        # wifi goes off
17:51:44.187: DefaultNetworkEvent(0 -> 100:CELLULAR)

Bug: 28204408
Change-Id: I63252633235bf6ba833b9ac431a80dda75a93e67
2016-05-25 10:03:38 +09:00
Felipe Leme
b5987d7993 Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f
am: 1411952a68

* commit '1411952a68f6fa2d2b3a3ee9599e24026454b19b':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: I62eb108dfad2ac1ffd2b541470f01a7923d92731
2016-05-24 18:23:58 +00:00
Felipe Leme
1411952a68 Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev
am: efd3a1749f

* commit 'efd3a1749f2737199643cc29bea6132a9786223b':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: I87b596346c058c7ac8efbebb67b43664f1be0fed
2016-05-24 18:13:16 +00:00
Felipe Leme
35631e00c9 Fixed enforceMeteredApnPolicy when Data Saver is on.
When enforceMeteredApnPolicy() is called when Data Saver mode is on and
the caller's UID is not whitelisted, it should add a
NET_CAPABILITY_NOT_METERED to the capabilities.

Change-Id: Ieed4f4a7634ee023ec58c91859263655e0ba62d4
Fixes: 28608499 (and https://code.google.com/p/android/issues/detail?id=208478)
2016-05-23 09:43:53 -07:00
Jeff Sharkey
c8113cac70 API council feedback: hide and document.
Hide isMetered() and clarify moveDatabaseFrom() docs.

Bug: 28870582, 28775585
Change-Id: Iabe63045c39ce7f662488f4224b56387c3c59519
2016-05-20 11:34:55 -06:00
Erik Kline
3c0c9b0f59 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: 42a5755916
am: 81092a2de8

* commit '81092a2de8d6d2cd003a88ed9dc991fa7dd0350d':

Change-Id: Id68aa8f81f11042c7583fad42da2063cbb17efe1
2016-05-19 04:27:24 +00:00
Erik Kline
57f4d9718e Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: 42a5755916
am: 8958153ac7

* commit '8958153ac7921349dd8770a33484ca96581277cc':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I314ceed6380af58fb3f6308dde11f2d29b324c66
2016-05-19 04:24:16 +00:00
Erik Kline
81092a2de8 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev
am: 42a5755916

* commit '42a5755916a21f01d264bdb58d2213dacf221cdf':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: Ic99edb732d532da27c042824e5ca07c4b35ccfa1
2016-05-19 04:21:17 +00:00
Erik Kline
42a5755916 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 2016-05-19 04:12:40 +00:00
Android Build Merger (Role)
16fcd4b42b Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev am: 1540a79a8b am: 43fbfbf94c" into nyc-mr1-dev-plus-aosp 2016-05-18 23:48:27 +00:00
Robin Lee
7067ad6047 Merge "Lock down networking when waiting for always-on" into nyc-dev am: 1540a79a8b
am: 43fbfbf94c

* commit '43fbfbf94c5b8ae4353b73c36d85ff02fd36fc67':
  Lock down networking when waiting for always-on

Change-Id: I883c68faafde99eb00c37962a517dceb4a4f9d32
2016-05-18 23:47:59 +00:00
Robin Lee
d198b4d891 Merge "Lock down networking when waiting for always-on" into nyc-dev am: 1540a79a8b
am: 198d6cf688

* commit '198d6cf688403cd82921510490c49219b3bdd487':
  Lock down networking when waiting for always-on

Change-Id: I4160a61ca437d20df4342a44ed24fc6ad47962c6
2016-05-18 23:47:52 +00:00
Robin Lee
198d6cf688 Merge "Lock down networking when waiting for always-on" into nyc-dev
am: 1540a79a8b

* commit '1540a79a8b65e1f2652f4882784d6386f9661cae':
  Lock down networking when waiting for always-on

Change-Id: I7be0a85597936421750d1da0fde3d55d7d4fabc5
2016-05-18 23:42:43 +00:00
Robin Lee
1540a79a8b Merge "Lock down networking when waiting for always-on" into nyc-dev 2016-05-18 23:37:24 +00:00
Robin Lee
48bf4ec223 Lock down networking when waiting for always-on
Fix: 26694104
Fix: 27042309
Fix: 28335277
Change-Id: I47a4c9d2b98235195b1356af3dabf7235870e4fa
2016-05-19 00:26:53 +01:00
Erik Kline
c6c6abab82 DHCPv4: lease expiration is fatal, renew failures are not
Bug: 24837343

Change-Id: Ib330864f8376b0907390d581b48cff5446b3392b
2016-05-18 16:17:03 +09:00
Android Build Merger (Role)
005e8467f8 Merge "Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 54bc88cdbc am: b6b7b81ae0" into nyc-mr1-dev-plus-aosp 2016-05-17 18:51:45 +00:00
Felipe Leme
bca933d951 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 54bc88cdbc
am: b6b7b81ae0

* commit 'b6b7b81ae0b5e619f1add42a66f98c187e25da9a':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: I64af44f5b12248facbeeef66d0ff5372ec5e69ed
2016-05-17 18:50:22 +00:00
Felipe Leme
e81819c43e Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 54bc88cdbc
am: 3b91df7ccf

* commit '3b91df7ccf7ee4adf9914ffcdcbf220eb9f9fd08':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Idb223f33d6c5b1d4054bd41f4b9b9672c507986c
2016-05-17 18:47:41 +00:00
Felipe Leme
b6b7b81ae0 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev
am: 54bc88cdbc

* commit '54bc88cdbcc566015a8cda3595b375a474b3def3':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: I4e19dd2828b8b67fc7b2d2173d77a82d67d53d19
2016-05-17 18:43:43 +00:00
TreeHugger Robot
54bc88cdbc Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 2016-05-17 18:28:22 +00:00
Robin Lee
1cd027befe Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: b0f3016b64
am: a7cc7c5b4e

* commit 'a7cc7c5b4edb125961bf5c219ecf57bce7876db5':
  Make some of the UID-based VPN code reusable

Change-Id: Ie7c88ba3eebe4af85a69f330cae3df3293113d4e
2016-05-17 17:52:45 +00:00
Robin Lee
a7cc7c5b4e Merge "Make some of the UID-based VPN code reusable" into nyc-dev
am: b0f3016b64

* commit 'b0f3016b64552674681dbc742667203d36c4c86d':
  Make some of the UID-based VPN code reusable

Change-Id: I3f1b1a08059aa58cb76db6cdd070b103024b9bf3
2016-05-17 17:36:43 +00:00
TreeHugger Robot
b0f3016b64 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 2016-05-17 17:30:01 +00:00