Commit Graph

2819 Commits

Author SHA1 Message Date
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
Felipe Leme
0a5393d82c Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 8debc39f17 am: 3b91df7ccf
am: 7353aa4803

* commit '7353aa48039b048aa9fa3f8c75c3e26114d46e22':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Ieb58dda8f4749ccf5218be5913beb488fd3247cf
2016-05-17 19:07:18 +00:00
Android Build Merger (Role)
f334dd564b Merge "Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 8debc39f17 am: 29052a804a" into nyc-mr1-dev-plus-aosp 2016-05-17 18:51:45 +00:00
Felipe Leme
a5333e4fc7 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 8debc39f17
am: 29052a804a

* commit '29052a804ade79cfe0892a9a2a4a46f639c1a0d1':
  Added a onRestrictBackgroundBlacklistChanged() callback.

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

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

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

* commit '8debc39f1727ee4540e08cf699a6fde75268a5da':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: I4e19dd2828b8b67fc7b2d2173d77a82d67d53d19
2016-05-17 18:43:43 +00:00
TreeHugger Robot
8debc39f17 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 2016-05-17 18:28:22 +00:00
Robin Lee
9b3fdfaab8 Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: 89bf3e3aa2 am: 0ab7ea1701
am: 9355427d9a

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

Change-Id: I75d9871f8039d14f8d83be4696c3c4d4e864f9c0
2016-05-17 17:59:59 +00:00
Robin Lee
9355427d9a Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: 89bf3e3aa2
am: 0ab7ea1701

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

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

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

Change-Id: I3f1b1a08059aa58cb76db6cdd070b103024b9bf3
2016-05-17 17:36:43 +00:00
TreeHugger Robot
89bf3e3aa2 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 2016-05-17 17:30:01 +00:00
Robin Lee
2543ed8799 Return legacy VPN info regardless of lockdown mode
This stops Settings from telling the user detailed information, and
doesn't really protect anything secret -- privileged apps can already
tell that there's an active VPN by looking at network info.

Change-Id: I9c2a3cab6dff1b62e94a9e0735dccde226fd26a3
Fix: 28624328
2016-05-17 14:31:52 +01:00
Felipe Leme
c202fc8bd6 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a am: ac719e480f
am: 2a7165b928

* commit '2a7165b9289f11b6f19d66cac259bef22b694323':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Ia86cbc0d7b0be02f7dad7446127c2c711bb9f771
2016-05-16 22:35:23 +00:00
Felipe Leme
2a7165b928 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a
am: ac719e480f

* commit 'ac719e480f66b7ef6e76b27a71396c98e7120804':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Id6197b9ee56fd06505c21c1bb5dce083998aa79a
2016-05-16 22:28:27 +00:00
Felipe Leme
ac719e480f Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev
am: 522787f39a

* commit '522787f39a759cf8af8438641fa8df7470a1b959':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Ie2e7b14ecc0b574a8776121d3c79c768093ef4f7
2016-05-16 22:23:44 +00:00
Felipe Leme
3edc616bf6 Documented return value of getRestrictBackgroundStatus().
Change-Id: I2c15a6d5e23cbc3c9b59c975196c1c04c1294471
Fixes: 28775490
2016-05-16 13:57:19 -07:00
Felipe Leme
57fc863cce Added a onRestrictBackgroundBlacklistChanged() callback.
When an UID is added / removed to the Data Saver blacklist, it's
necessary to notify internal components such as the Settings UI (which
was erroneously listening to UID rules changes instead).

BUG: 28743623
BUG: 28791717

Change-Id: I11c85e141dfe074ad390fd324309d2412bfbbd45
2016-05-16 13:30:57 -07:00
Android Build Merger (Role)
079de0bd05 Merge "Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: bc26d925c6 am: 0ee15c2e57 am: be24cac6d6" 2016-05-13 17:37:20 +00:00