Commit Graph

3186 Commits

Author SHA1 Message Date
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
Chen Xu
fdbf599a08 Merge "cold sim clean up" into nyc-mr1-dev am: ba3428f01b
am: dc9ff70da1

* commit 'dc9ff70da15c927afccad064f16d143a25b92aca':
  cold sim clean up

Change-Id: Ie35dd1dbede46a1ae6f6a1c902e8d54321325500
2016-06-04 05:58:44 +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
Robin Lee
29f5ff0d7e Merge "Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 4fb4490dfb am: 624febb525" into nyc-mr1-dev-plus-aosp
am: 57fba6df50

* commit '57fba6df500980abec7b35019edc023e141fba98':

Change-Id: Icfb0bcb2ec831c80303bc10747c84ebed606d607
2016-05-25 21:38:32 +00:00
Robin Lee
9454788178 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 4fb4490dfb am: ef7e644fc5
am: 3b693c82ad

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

Change-Id: Ifff21798ff23d1906810d23393efc3e0cad14941
2016-05-25 21:37:36 +00: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
Jeff Sharkey
2a1ea5a666 Merge "API council feedback: hide and document." into nyc-dev am: 3e0e975a38 am: 8d5d9a0ff4
am: 8e401c2437

* commit '8e401c24372a9c195de0e07cda66325e2c79bdef':

Change-Id: I55eea1304d724b43850ceb1bbebc3545a3c5d389
2016-05-25 21:06:47 +00:00
Jeff Sharkey
958359744a Merge "API council feedback: hide and document." into nyc-dev am: 3e0e975a38 am: 19e2f49181
am: dfd98ed300

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

Change-Id: I002236f584ddc7a5f479b8936e4b5f5ed61759eb
2016-05-25 21:06:41 +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
TreeHugger Robot
3e0e975a38 Merge "API council feedback: hide and document." into nyc-dev 2016-05-25 20:43:56 +00:00
TreeHugger Robot
4e64564222 Merge "Add missing @Deprecated annotations." 2016-05-25 17:46:40 +00:00
Hugo Benichi
70f5dd4931 Merge "Merge "Fix default network transition event recording" into nyc-dev am: c6246b996d am: 6a63f7b496" into nyc-mr1-dev-plus-aosp
am: 6b7c5ff9ac

* commit '6b7c5ff9ac6e671606a8287a12aa56d0c8121403':

Change-Id: I85c1bcf50de31e3d4de74263eaac43ef8e461e27
2016-05-25 03:46:32 +00:00
Hugo Benichi
487952a816 Merge "Fix default network transition event recording" into nyc-dev am: c6246b996d am: 477091dd52
am: 2fcea4ad90

* commit '2fcea4ad90da60fbe8447fbe48eac70a99b13339':
  Fix default network transition event recording

Change-Id: I37d885e48268e43944fe8afe4dca3f4322d508ac
2016-05-25 03:41:14 +00:00
Android Build Merger (Role)
6b7c5ff9ac Merge "Merge "Fix default network transition event recording" into nyc-dev am: c6246b996d am: 6a63f7b496" into nyc-mr1-dev-plus-aosp 2016-05-25 03:38:16 +00:00
Hugo Benichi
95a381714d Merge "Fix default network transition event recording" into nyc-dev am: c6246b996d
am: 6a63f7b496

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

Change-Id: I94e4ff336a8102f4bc0e19acb705ba4838a1f17a
2016-05-25 03:37:22 +00:00
Hugo Benichi
2fcea4ad90 Merge "Fix default network transition event recording" into nyc-dev am: c6246b996d
am: 477091dd52

* commit '477091dd5266bdec175b11ffcb2f36ac01a34582':
  Fix default network transition event recording

Change-Id: Ife822c39d617f89dde4cda5f2137b80425fe89ad
2016-05-25 03:37:19 +00:00
Hugo Benichi
477091dd52 Merge "Fix default network transition event recording" into nyc-dev
am: c6246b996d

* commit 'c6246b996d0f9c96f5f727d8f9894cb93a17a9b2':
  Fix default network transition event recording

Change-Id: Ic6ae9cd2620b1793f53667eb7d84c0b6f56d716e
2016-05-25 03:31:34 +00:00
Hugo Benichi
c6246b996d Merge "Fix default network transition event recording" into nyc-dev 2016-05-25 03:22:32 +00:00
Hugo Benichi
d3e4645858 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
Aurimas Liutikas
e80a0eb435 Add missing @Deprecated annotations.
Add missing @Deprecated annotations for methods with @deprecated tag
in javadoc.

Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844
2016-05-24 15:22:55 -07:00
Felipe Leme
6836591712 Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f am: bf53edcadb
am: 31e3b72e85

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

Change-Id: If9e525f86b29960ed4dfdd6ca27bc5d0077454ae
2016-05-24 18:44:45 +00:00
Felipe Leme
31e3b72e85 Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f
am: bf53edcadb

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

Change-Id: I62eb108dfad2ac1ffd2b541470f01a7923d92731
2016-05-24 18:23:58 +00:00
Felipe Leme
bf53edcadb 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
5902c444d7 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
ca4340007e 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
fd19b7f91e Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: bd4b5327db am: ef4e70afc3
am: 5a3f1a25b0

* commit '5a3f1a25b026b9ff5e8fb85e5fdfe0d131171d5d':

Change-Id: Id5a57f95fcf00474fb14569c66a8bdd4a7b2d903
2016-05-19 04:34:18 +00:00
Erik Kline
7b12b8ca59 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: bd4b5327db am: 8958153ac7
am: 8ab4a8d08a

* commit '8ab4a8d08a3aadab24a20d227d9bbaf15e99f879':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I4a0be195dab4525258b455330ce6212987b0e6c0
2016-05-19 04:27:26 +00:00
Erik Kline
5a3f1a25b0 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: bd4b5327db
am: ef4e70afc3

* commit 'ef4e70afc3d90dfdf3298423c1b7473dd6cd346d':

Change-Id: Id68aa8f81f11042c7583fad42da2063cbb17efe1
2016-05-19 04:27:24 +00:00
Erik Kline
8ab4a8d08a Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: bd4b5327db
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
ef4e70afc3 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev
am: bd4b5327db

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

Change-Id: Ic99edb732d532da27c042824e5ca07c4b35ccfa1
2016-05-19 04:21:17 +00:00
Erik Kline
bd4b5327db Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 2016-05-19 04:12:40 +00:00
Robin Lee
86c5d3fb16 Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev am: f9773c5fdd am: 43fbfbf94c" into nyc-mr1-dev-plus-aosp
am: 060efdabc8

* commit '060efdabc860e2328b8bb42e49a733496eceaf68':

Change-Id: I09b4ac15a63b8e8972e19ffeccfa1a6eccfdded2
2016-05-18 23:53:30 +00:00
Robin Lee
3f4104a2a1 Merge "Lock down networking when waiting for always-on" into nyc-dev am: f9773c5fdd am: 39db67ab88
am: d5c5c8f88b

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

Change-Id: I50583a9738ac51378e5f5dcbbaa396f1aa30f97c
2016-05-18 23:53:25 +00:00
Android Build Merger (Role)
060efdabc8 Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev am: f9773c5fdd am: 43fbfbf94c" into nyc-mr1-dev-plus-aosp 2016-05-18 23:48:27 +00:00
Robin Lee
c832fae669 Merge "Lock down networking when waiting for always-on" into nyc-dev am: f9773c5fdd
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
d5c5c8f88b Merge "Lock down networking when waiting for always-on" into nyc-dev am: f9773c5fdd
am: 39db67ab88

* commit '39db67ab882903220ac7f34d1febad17760681b0':
  Lock down networking when waiting for always-on

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

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

Change-Id: I7be0a85597936421750d1da0fde3d55d7d4fabc5
2016-05-18 23:42:43 +00:00
Robin Lee
f9773c5fdd Merge "Lock down networking when waiting for always-on" into nyc-dev 2016-05-18 23:37:24 +00:00
Robin Lee
1bb13dc5e1 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
7b0a58168e DHCPv4: lease expiration is fatal, renew failures are not
Bug: 24837343

Change-Id: Ib330864f8376b0907390d581b48cff5446b3392b
2016-05-18 16:17:03 +09:00
Felipe Leme
3e99991a0b Merge "Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 8debc39f17 am: 29052a804a" into nyc-mr1-dev-plus-aosp
am: f334dd564b

* commit 'f334dd564b3b9d5d0483293bbf5710dba5fbde76':

Change-Id: Ic593bbfcf2c90d588858c9e2ae516f0a3162ca52
2016-05-17 19:08:04 +00:00