Commit Graph

1986 Commits

Author SHA1 Message Date
Hugo Benichi
f2450e5b5c Merge "Remove unused DHCP timeout event tag." into nyc-dev am: 6e1d1db am: 48b8d14
am: 9deef0c

* commit '9deef0ceb7668d0029ebc4bb2682edae3b1a63c3':
  Remove unused DHCP timeout event tag.

Change-Id: Ie6381a65faf36894d498ec36b231ede0f0fc0e52
2016-04-19 07:17:43 +00:00
Hugo Benichi
23e0e805c5 Remove unused DHCP timeout event tag.
DHCP timeouts should not be logged at DHCPClient level but as a timeout
event in IpManager.

Bug: 28204408
Change-Id: Ia12619e3bf71102cf289cbbcdec53fd5e7e8efff
2016-04-19 14:26:53 +09:00
Hugo Benichi
e78f7544fd Merge "Make android.net.metrics Event classes @SystemApi am: 4b6dfc2 am: 9cae985" into nyc-mr1-dev-plus-aosp
am: ab317e3

* commit 'ab317e363f35e75cb64175707e6a4f058d95321e':
  Make android.net.metrics Event classes @SystemApi

Change-Id: Iaa17df5b1c40f399be22133ecddb3a2440023329
2016-04-18 04:25:20 +00:00
Hugo Benichi
4cc6157ec6 Merge "Fixes fatal linter errors in android.net.metrics am: 627b424 am: 4acf772" into nyc-mr1-dev-plus-aosp
am: 99e19f0

* commit '99e19f05f3db1de280e1647c52ddb96a93beb2c1':
  Fixes fatal linter errors in android.net.metrics

Change-Id: I258c7b4f163f60d38ac86985b6b6cdf8dc92199e
2016-04-18 04:25:15 +00:00
Hugo Benichi
d06bcb897c Fix spurious DHCP parse error logging. am: 2677b19 am: 2fd113f
am: 41be6c6

* commit '41be6c6e29dd171508fdd932fcd7e38185253b2f':
  Fix spurious DHCP parse error logging.

Change-Id: I341b0067062ca83baa0b14a5eaba6ac863b51006
2016-04-18 04:25:02 +00:00
Hugo Benichi
4b6dfc2ef5 Make android.net.metrics Event classes @SystemApi
Bug: 28204408
Change-Id: I8ffe833213bbc03a7f70c51789f4899ee08f6e08
2016-04-18 11:36:42 +09:00
Hugo Benichi
627b42494d Fixes fatal linter errors in android.net.metrics
This patch changes how Event classes are organized:
 - Base IpConnectivityEvent class does not implement Parcelable because
   it cannot be final (has children). It also becomes abstract because
   it is not supposed to be instantiated and logged directly.
 - All children classes becomes final because they are Parcelable.
 - All constructors of all children classes become private, because they
   are supposed to be instantiated with their associated logEvent()
   methods.
 - All instance fields of all children classes become public final.
      Rational: if private, the ConnectivityMetrics app cannot read
      their data.

Bug: 28204408
Change-Id: I1a4689c422230c6ed034307dec54a61daf8a6598
2016-04-18 11:29:03 +09:00
Hugo Benichi
2677b1957b Fix spurious DHCP parse error logging.
This patch moves the event logging of DHCP response packet parse errors
to DHCPClient in a single place. It also logs receive IO errors as
DHCPErrors instead of DHCPClientEvents.

BUG=28197345

Change-Id: I7ad666cff4d8b97915880477347fbb3f588fdb2a
2016-04-18 11:27:35 +09:00
Pavel Zhamaitsiak
ccfa19f139 Merge "Make ConnectivityMetricsLogger and related classes @SystemApi" into nyc-dev am: 74870c4
am: 229e517

* commit '229e5179ba1915b5beb86b0d7989fb356bef9966':
  Make ConnectivityMetricsLogger and related classes @SystemApi

Change-Id: Ia33ecf02187f0c945c0e70d6d939c310cca3c6e1
2016-04-15 18:57:18 +00:00
Pavel Zhamaitsiak
74870c441f Merge "Make ConnectivityMetricsLogger and related classes @SystemApi" into nyc-dev 2016-04-15 18:45:06 +00:00
TreeHugger Robot
cda498e72a Merge "Metrics logging for DNS queries." into nyc-dev am: 46dc79ce
am: fb83e07

* commit 'fb83e07ada2c0379c0a644e86af4e60fc547031c':
  Metrics logging for DNS queries.

Change-Id: I95bdef31a9dee74432dd069a101ccd552377330d
2016-04-15 11:25:46 +00:00
Lorenzo Colitti
e5d75abbb9 Disambiguate NetworkCallback JavaDoc. am: 88bc0bb
am: c8a0754

* commit 'c8a0754b3d98e90a869acb9dcc8ca8ae40bcbde1':
  Disambiguate NetworkCallback JavaDoc.

Change-Id: Ibf47574237ea8467d8e536395d580bac9f8fea36
2016-04-15 09:54:58 +00:00
Lorenzo Colitti
43724734d7 Metrics logging for DNS queries.
Bug: 28204408
Change-Id: I05fc9b580aa20d99e8766057e17a38b5eb6267e8
2016-04-15 16:54:39 +09:00
Lorenzo Colitti
88bc0bbb13 Disambiguate NetworkCallback JavaDoc.
The JavaDoc for many of the requestNetwork and
[un]registerNetworkCallback APIs incorrectly mentions the
PendingIntent version of the APIs instead of the NetworkCallback
version.

Also fix a minor issue in the registerDefaultNetworkCallback
JavaDoc: the default network request is an implementation detail,
so don't mention it. Instead, talk about the "system default
network".

Change-Id: Id94d98261daa2bd768c10e033cb8092729b21c91
2016-04-15 16:24:13 +09:00
Pavel Zhamaitsiak
f6f24c03f3 Make ConnectivityMetricsLogger and related classes @SystemApi
Bug: 25691077
Change-Id: Ia98d0a52a9541d9ae773be2b0e962d609f9dd7ee
2016-04-14 19:15:23 -07:00
Chad Brubaker
3280b8fb1e Merge "Fix isUserAddedCertificate" into nyc-dev am: 439525a
am: 69d729b

* commit '69d729b851ff07ecb4dc488a3ca10ef6cff896ea':
  Fix isUserAddedCertificate

Change-Id: I009207c3e72530db2ea54f4b40cf11f4f2537d14
2016-04-14 21:01:53 +00:00
Chad Brubaker
439525a993 Merge "Fix isUserAddedCertificate" into nyc-dev 2016-04-14 20:48:53 +00:00
TreeHugger Robot
ceac5dd9de Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev am: 0628d32
am: 886d17c

* commit '886d17c035805cef3bce3d2d96e53ba48bf5b62b':
  Also log IPv4 and IPv6 connectivity of any previous default network

Change-Id: I8c82f1058531d1f5a0cdb73314b8fd742dae7860
2016-04-14 19:26:50 +00:00
Hugo Benichi
018a9d3127 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev am: fc18b6f
am: 39de1e2

* commit '39de1e2de51f4c0789904abb1623c8b7d648411e':
  Add DHCP error event class and record DHCP errors.

Change-Id: I8262883d6178be380265cf35497782f35dab043c
2016-04-14 18:52:01 +00:00
Pierre Imai
87421a21c7 Merge changes Ia71865a9,I40b6de54 into nyc-dev am: 1feca76
am: f8ef3c3

* commit 'f8ef3c36a97b68b5e27127681973244f481cca09':
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.

Change-Id: If019f2c448ed3411a0b23dfdd6038e1b9fe2099d
2016-04-14 18:51:38 +00:00
TreeHugger Robot
b03419e212 Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev am: f824e58
am: 48f8f29

* commit '48f8f2951bf54dcf998916e915e150f782088c71':
  Add some more metrics: IpManager, IpReachabilityMonitor

Change-Id: Idda93d8b3c1b3d6a12d3958627fb291f647b18dd
2016-04-14 18:45:53 +00:00
TreeHugger Robot
0628d324d0 Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev 2016-04-14 10:14:20 +00:00
Erik Kline
48f12f2ad6 Also log IPv4 and IPv6 connectivity of any previous default network
Change-Id: I07595c0a131fea21914f524949cd64af87403b88
2016-04-14 17:54:46 +09:00
Hugo Benichi
fc18b6f360 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev 2016-04-14 08:01:31 +00:00
Pierre Imai
1feca76bd4 Merge changes Ia71865a9,I40b6de54 into nyc-dev
* changes:
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.
2016-04-14 07:25:34 +00:00
Hugo Benichi
6241874355 Add DHCP error event class and record DHCP errors.
This patch adds an event class derived from IpConnectivityEvent that
records parsing errors of DHCP response packets.

Change-Id: I19516cf05e3419c4262e3236899e52987e5f2264
2016-04-14 15:40:10 +09:00
Pierre Imai
6b4e15b155 Record the transport types for connectivity events.
BUG: 25691077
Change-Id: I40b6de5446325e717c0356603fd66cd395db9acb
2016-04-14 15:38:17 +09:00
Erik Kline
5b25a0f796 Add some more metrics: IpManager, IpReachabilityMonitor
Change-Id: Ibb7150c849715a42fc2c879589eaaf86e8a007e7
2016-04-14 10:53:30 +09:00
Chad Brubaker
00a4e29969 Fix isUserAddedCertificate
Check if the CA is in the user store directly instead of delegating to
the TrustManager. This removes one more reflection dependency between
X509TrustManagerExtensions and the default X509TrustManager.

Bug: 28138736
Change-Id: I16c17bf6230becdc0a1948b1d184212f83ee25f0
2016-04-13 10:20:08 -07:00
Pierre Imai
a3f8b53893 Merge "Fix a memory leak in ConnectivityManager." into nyc-dev am: 11a888f
am: e235da5

* commit 'e235da5d5cb1db440db228ee23314617e7dd9aa4':
  Fix a memory leak in ConnectivityManager.

Change-Id: I713b4d68033aaac4ef2ada50a486538459814e77
2016-04-13 06:44:29 +00:00
Pierre Imai
11a888faaf Merge "Fix a memory leak in ConnectivityManager." into nyc-dev 2016-04-13 06:37:33 +00:00
Paul Jensen
45dd59b0f1 Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev am: 3e6a6fc
am: 2c1f03a

* commit '2c1f03ade023a61428b7d9101bc10e4c88ae941a':
  If Internet probe is redirected, pass redirect destination to NetworkAgent.

Change-Id: I4c5f5cb8591d8729de9036a6c2aabacd4aba0f39
2016-04-13 02:02:13 +00:00
Jeff Sharkey
45630fc0d3 Merge "Fix broken javadoc." into nyc-dev am: cadfc77
am: f58879a

* commit 'f58879ac196662ea39b91d44179b2a0e86a52c4d':
  Fix broken javadoc.

Change-Id: I55e96a9ee2c735a0ff2b1254520d843b4ca13eeb
2016-04-13 01:59:58 +00:00
Paul Jensen
3e6a6fc60e Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev 2016-04-13 01:33:37 +00:00
Jeff Sharkey
cadfc77d03 Merge "Fix broken javadoc." into nyc-dev 2016-04-12 23:37:38 +00:00
Chad Brubaker
cbbb714aaf Merge "Merge "Add implemention for isSameTrustConfiguration" into nyc-dev am: d92e5c3" into nyc-dev-plus-aosp
am: 4cc9d9d

* commit '4cc9d9d5e89aab0b30e7397382d0404702e5a02f':
  Add implemention for isSameTrustConfiguration

Change-Id: I56e87c662673084e311b23abf898aba368d26f8c
2016-04-12 22:42:06 +00:00
Jeff Sharkey
f82c2f0854 Fix broken javadoc.
Change-Id: I9f2050fd6040234bb1d759ab346f79fc41247aa9
2016-04-12 15:22:57 -06:00
Chad Brubaker
5116ac0d22 Add implemention for isSameTrustConfiguration
Bug: 27672565
Change-Id: Id5291a4a5f2ca75fdf84db4d51363735f1a76845
2016-04-12 13:04:43 -07:00
Paul Jensen
2324373124 If Internet probe is redirected, pass redirect destination to NetworkAgent.
Transport may use the redirect to make additional determination about network
state.

Bug: 25203607
Change-Id: I07d8918f13fdcbe0b6fd757536bfc1850a2a244f
2016-04-12 08:54:36 -04:00
Pierre Imai
b290c0a2cb Fix a memory leak in ConnectivityManager.
Remove callbacks from the internal storage when they are being unregistered.

Change-Id: Ia42ed7aefaebd8caf3eada8e42b6cb7a940d7647
2016-04-12 15:00:28 +09:00
Jack Yu
2890f6053f Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev am: 2e062ab
am: 6754d23

* commit '6754d237bb8c6e1fba779f90417b4a2fe07d2b3e':
  Excluded certain APNs (e.g. IMS) from mobile data usage.

Change-Id: I0f37f4d296de88763019f469a0356e753b9f3636
2016-04-09 06:25:54 +00:00
Jack Yu
2e062ab8de Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev 2016-04-09 03:30:31 +00:00
Jack Yu
66a6be3a4c Excluded certain APNs (e.g. IMS) from mobile data usage.
Added not_metered capability to a mobile network if none
of its associated APN types are metered. Also used not_metered
capability to determine if a network should be accounted for
data usage or not instead of using network type, which is
always MOBILE after refactoring. Will add VT usage support
in next phase.

bug: 20888836
Change-Id: Id692cb856be9a47d0e918371112630128965b1bb
2016-04-07 10:07:31 -07:00
Robin Lee
34afb60a8d Merge "Internal API for system apps to determine default network for other apps" into nyc-dev am: 1b83651
am: a948f88

* commit 'a948f8872aa045ab22f42285f195fdb413c5ff66':
  Internal API for system apps to determine default network for other apps

Change-Id: Ib719f0cebb41afe4aa52241f3797598a7e468d2d
2016-04-07 16:51:53 +00:00
Robin Lee
1b83651e7f Merge "Internal API for system apps to determine default network for other apps" into nyc-dev 2016-04-07 16:43:15 +00:00
Robin Lee
d2baf792f8 Internal API for system apps to determine default network for other apps
Callers with CONNECTIVITY_INTERNAL permission can read off the netId
that an application is assigned to by default.

Necessary for making connections as the default network for a client
app eg. when downloading stuff on its behalf.

Bug: 27074270
Change-Id: I8d35e8e99126875f55f3c545090326f3e9be43fb
2016-04-07 14:55:59 +00:00
Erik Kline
5a0577a334 Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev am: 3671285
am: a577a3a

* commit 'a577a3a29f601fd2b71ad89eedcc52bdd8efbccb':
  Make public the registerDefaultNetworkCallback API

Change-Id: Ic749ede5b84e443fed04701ecdd0f6521a77158f
2016-04-06 08:58:22 +00:00
Erik Kline
f46600d074 Make public the registerDefaultNetworkCallback API
Change-Id: I89d7a6f49f5d6a0da3402a07407b0f8d93181b4f
2016-04-06 12:22:47 +09:00
Erik Kline
914c689a4c Merge "Delete unused DnsPinger" into nyc-dev am: 49e2db1
am: 58e0a1c

* commit '58e0a1c7623f8816404f8db049edad9a9eb9beaf':
  Delete unused DnsPinger

Change-Id: I797eea73323a6506648c1b0e4fd2a6695f661fae
2016-04-06 02:17:59 +00:00
Erik Kline
49e2db1b10 Merge "Delete unused DnsPinger" into nyc-dev 2016-04-06 02:07:02 +00:00