Commit Graph

2559 Commits

Author SHA1 Message Date
Hugo Benichi
bcae090f71 Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372 am: a89d8bbc8d
am: 5fb9102975

* commit '5fb9102975ebaa4a3d538c55b07cba01562e22d0':

Change-Id: Ifd69770e1971b8be80a69b040479abd3c0997c2b
2016-04-22 10:00:13 +00:00
Hugo Benichi
369984c2e3 Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372 am: cbb0d77bcd
am: 0c1f013ba2

* commit '0c1f013ba243eff80772317c2b6c5beb2083fe2b':
  Split network monitoring and portal probe events

Change-Id: I4cd3eeb25f63fe3731883ec2cc4fbfc3602bfba8
2016-04-22 09:55:38 +00:00
Hugo Benichi
5fb9102975 Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372
am: a89d8bbc8d

* commit 'a89d8bbc8d92a9c2f607a92f044cdbcc53c3b269':

Change-Id: If985ed98593c2248bb16c998e5fc8898bf48bd7f
2016-04-22 09:55:38 +00:00
Hugo Benichi
0c1f013ba2 Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372
am: cbb0d77bcd

* commit 'cbb0d77bcdacc50f130eeb93f9ef2285c6dfcaf9':
  Split network monitoring and portal probe events

Change-Id: I8c1169d61ca526449beb4509005ceae4b3dca51e
2016-04-22 09:53:19 +00:00
Hugo Benichi
a89d8bbc8d Merge "Split network monitoring and portal probe events" into nyc-dev
am: 784c93e372

* commit '784c93e372ff8ba8ca59499a8e35d83e5bd71c1a':
  Split network monitoring and portal probe events

Change-Id: I1e9208a9c8cd178ec31edf1755cc82db980b9071
2016-04-22 09:51:01 +00:00
Hugo Benichi
a616d96929 Split network monitoring and portal probe events
This patches changes how captive portal tests and network lifecycle
events are logged as connectivity events:
  - it splits NetworkMonitorEvent into two event classes:
      - ValidationProbeEvent for logging individual probe events.
      - NetworkEvent for logging network connection, validation,
        lingering, and disconnection.
  - it removes the redundant CaptivePortalCheckResultEvent class.
    The information logged in CaptivePortalCheckResultEvent was already
    logged by NetworkMonitorEvent, but missing the evaluation durations.
    It is now logged by ValidationProbeEvent.
  - it removes the CaptivePortalStateChangeEvent class, which is now
    redundant with NetworkEvent, but missing evaluation durations.

In addition, it adds event logging when ConnectivityService puts a
network into lingering or removes a network from lingering.

Bug: 28204408
Change-Id: I8f9752e4d36175ecfcbd1545a01a41bad6e06ea4
2016-04-22 17:08:56 +09:00
Paul Jensen
2b99c21d8f Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev am: 4088540675 am: a16abc0cef
am: 6f61176bb3

* commit '6f61176bb3b7dd60edb03042d9e5cc93332a24f6':
  Cap number of NetworkRequests a UID can make to 100

Change-Id: I72fe474d3618c2900e972cefdc85e80767610405
2016-04-21 13:59:20 +00:00
Paul Jensen
6f61176bb3 Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev am: 4088540675
am: a16abc0cef

* commit 'a16abc0cefcb25700294374ee6ad76e407142b10':
  Cap number of NetworkRequests a UID can make to 100

Change-Id: I44df1d666f710f938951820227090c4dbbbb7293
2016-04-21 13:57:12 +00:00
Paul Jensen
a16abc0cef Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev
am: 4088540675

* commit '40885406754e50c5e6f0b9ca2175f1b46062d692':
  Cap number of NetworkRequests a UID can make to 100

Change-Id: Ic664fa080316eff75dd22fc8e84431cb0eb903be
2016-04-21 13:54:53 +00:00
Paul Jensen
4088540675 Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev 2016-04-21 13:47:13 +00:00
Hugo Benichi
34a3219502 Merge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: bab20bef0c" into nyc-mr1-dev-plus-aosp
am: 8ce11b2a84

* commit '8ce11b2a84e29eb0b7398659c3989298358153fc':

Change-Id: I4f344e75e4d2023df289f0e3479a95af2b933fc7
2016-04-21 04:20:01 +00:00
Hugo Benichi
604f7596b6 Merge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: bab20bef0c" into nyc-mr1-dev-plus-aosp
am: 1d983bc7e5

* commit '1d983bc7e5fc9e71e2100f80f00725a0062c21c0':

Change-Id: I3b177ab1ebca3f8972574691c636c1e14cebe265
2016-04-21 04:19:58 +00:00
Hugo Benichi
5d1abac0b5 Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: eb8372d38c
am: d8fe76b264

* commit 'd8fe76b2643b69ae523f21783875d922b2423521':
  Some fixes in ConnectivityService event logging

Change-Id: Icb50bdab260da6476c1d1148fa2d8995b106a809
2016-04-21 04:19:53 +00:00
Android Build Merger (Role)
8ce11b2a84 Merge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: bab20bef0c" into nyc-mr1-dev-plus-aosp 2016-04-21 04:17:37 +00:00
Hugo Benichi
9e43e4b6cf Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
am: bab20bef0c

* commit 'bab20bef0cd7083b66b876f9ea295d704b0f460d':

Change-Id: I7d2861350744e3bdefe6f4315d9a6de79d136e1c
2016-04-21 04:17:08 +00:00
Android Build Merger (Role)
1d983bc7e5 Merge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: bab20bef0c" into nyc-mr1-dev-plus-aosp 2016-04-21 04:15:41 +00:00
Hugo Benichi
d8fe76b264 Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
am: eb8372d38c

* commit 'eb8372d38c31af196285d2fee60ae53adb113eca':
  Some fixes in ConnectivityService event logging

Change-Id: Ie356b2df2b84b36e6a2a52d3246ff434557ee89b
2016-04-21 04:15:10 +00:00
Hugo Benichi
217eb1a309 Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
am: bab20bef0c

* commit 'bab20bef0cd7083b66b876f9ea295d704b0f460d':
  Some fixes in ConnectivityService event logging

Change-Id: Ib605d0f63a4b7477d56508213da8663cb681b1ef
2016-04-21 04:15:07 +00:00
Hugo Benichi
bab20bef0c Merge "Some fixes in ConnectivityService event logging" into nyc-dev
am: 7261fb27de

* commit '7261fb27de16bb6d3ebd81bd3b73062bd212ea7e':
  Some fixes in ConnectivityService event logging

Change-Id: I0ca861a1d35eb6cdb5490d04a725d64465eebc31
2016-04-21 04:12:56 +00:00
Hugo Benichi
41667a0ca3 Some fixes in ConnectivityService event logging
Bug: 28204408
Change-Id: I44ed9539bb213a845c2bcc2861c947af7c3c9ef4
2016-04-21 11:03:08 +09:00
Felipe Leme
2f3140a898 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba am: c1eafaf
am: 79dd1fa

* commit '79dd1fa78bfde7277fc30cb9944e42130b91b1ad':

Change-Id: I77cac0c974fb49ce008a517b5452d609165f99f7
2016-04-20 23:15:06 +00:00
TreeHugger Robot
79dd1fa78b Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba
am: c1eafaf

* commit 'c1eafafbdb0c5fbfbb3665fc8a04a68bfa55fe0e':

Change-Id: I2b3381b6f351a3f9dffa2b0ae1c2d50688b9ad85
2016-04-20 21:42:40 +00:00
Felipe Leme
096a5e302a Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba am: 0627850
am: 87fef43

* commit '87fef433bb9d2e62ef634ff40df9117939ef54df':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: Iae1c0af0aec6dba501249c0db08ade5a36f99607
2016-04-20 21:29:18 +00:00
TreeHugger Robot
87fef433bb Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba
am: 0627850

* commit '0627850430ba3dad041891de570e0d08e22c13d2':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: I278f8b4f8e29ea69b15e7bef9556c0ed0a81c82b
2016-04-20 21:11:50 +00:00
Felipe Leme
c1eafafbdb Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev
am: 9724fba

* commit '9724fba83545fd075cbda62bb13cdc7820c7291a':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: I1ee90168f1cf29a117961ba1e269fbc89c7f443b
2016-04-20 21:10:41 +00:00
Paul Jensen
7f11b4f8b3 Cap number of NetworkRequests a UID can make to 100
This prevents DoSing ConnectivityService with too many requests.

Fixes: 27253080
Change-Id: Id0480d220b2f01b9ef1146bef8ead2fc8287e28d
2016-04-20 10:52:47 -04:00
Felipe Leme
56f0084553 Added onRestrictBackgroundWhitelistChanged callback.
When users add or remove an app to the Data Saver Mode whitelist, the
app is notified through a
ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED. But besides this
broadcast, it's also necessary to notify internal apps such Settings,
hence a new method is being added to INetworkPolicyListener.

BUG: 27481520
Change-Id: I1537a77becf6b7da1535ed5faabdc894fd9f7084
2016-04-19 12:06:00 -07:00
Narayan Kamath
9422b3f3d7 Merge "Remove unnecessary allocation+unboxing of objects. am: 846fa3e am: 4c1e2e3" into nyc-mr1-dev-plus-aosp
am: 94698f8

* commit '94698f85b50100b3db3bc2811501edfd54aa9324':

Change-Id: I74383face9cb4a1a205799f226e2133050db5660
2016-04-18 10:42:33 +00:00
Narayan Kamath
39c3aba0e0 Remove unnecessary allocation+unboxing of objects. am: 846fa3e am: 4c89ae0
am: 83da731

* commit '83da731d0859b74cdb38a327b15753bcbd3192b8':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: Ic48935549f7f9b13d5f0a2d98fc0979fbfc5a38b
2016-04-18 10:42:28 +00:00
Android Build Merger (Role)
94698f85b5 Merge "Remove unnecessary allocation+unboxing of objects. am: 846fa3e am: 4c1e2e3" into nyc-mr1-dev-plus-aosp 2016-04-18 10:38:02 +00:00
Lorenzo Colitti
a3dbc3e01f resolve merge conflicts of 72fa0d4 to nyc-dev-plus-aosp am: 0bf762a
am: 0928b62

* commit '0928b620d2f0b78d49b13059eba475da4801ad70':
  When the applicantion is removed, reset network permission of this uid.

Change-Id: I3750e3f805bfc71558025fe078f1ad25e5af7cff
2016-04-18 10:36:38 +00:00
Narayan Kamath
83da731d08 Remove unnecessary allocation+unboxing of objects. am: 846fa3e
am: 4c89ae0

* commit '4c89ae0ee4f3d73d84843bf05cdc328b5e821da3':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: I46f5ec0b9b8bc14073bcf7dc643bc909072d53ff
2016-04-18 10:36:37 +00:00
Narayan Kamath
4c1e2e3dee Remove unnecessary allocation+unboxing of objects.
am: 846fa3e

* commit '846fa3ec835626752a0d192db7e1eae873f06403':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: Idfffa8fad0f6bcffa954752910524bdc879d65b7
2016-04-18 10:31:37 +00:00
Lorenzo Colitti
0bf762aaf9 resolve merge conflicts of 72fa0d4 to nyc-dev-plus-aosp
Change-Id: Id7f317a20e422b215efff89a5c71c9b445d18cf4
2016-04-18 17:58:31 +09:00
Narayan Kamath
846fa3ec83 Remove unnecessary allocation+unboxing of objects.
Transforming String->int can be done with 0 allocations
using Integer.parseInt.

bug: 28078871
Change-Id: I8d9f322d7154728849dde61ef282046032858d60
2016-04-18 09:55:59 +01:00
Lorenzo Colitti
8bb9fd9f37 Disambiguate NetworkCallback JavaDoc. am: ad458ad
am: c8a0754

* commit 'c8a0754b3d98e90a869acb9dcc8ca8ae40bcbde1':
  Disambiguate NetworkCallback JavaDoc.

Change-Id: Ibf47574237ea8467d8e536395d580bac9f8fea36
2016-04-15 09:54:58 +00:00
Lorenzo Colitti
ad458adea7 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
TreeHugger Robot
5b13427bb4 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
Pierre Imai
3ebd274595 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
Erik Kline
2e815d38ac Also log IPv4 and IPv6 connectivity of any previous default network
Change-Id: I07595c0a131fea21914f524949cd64af87403b88
2016-04-14 17:54:46 +09:00
Pierre Imai
dd55013f97 Log an event whenever we lose the default network.
Change-Id: Ia71865a90b2db5dc0d3ad627563a6b1f99686f04
2016-04-14 15:38:29 +09:00
Pierre Imai
b5cffc79fb Record the transport types for connectivity events.
BUG: 25691077
Change-Id: I40b6de5446325e717c0356603fd66cd395db9acb
2016-04-14 15:38:17 +09:00
Pierre Imai
df03e7f2b1 Merge "Fix a memory leak in ConnectivityManager." into nyc-dev am: d97107a
am: e235da5

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

Change-Id: I713b4d68033aaac4ef2ada50a486538459814e77
2016-04-13 06:44:29 +00:00
Pierre Imai
d97107a879 Merge "Fix a memory leak in ConnectivityManager." into nyc-dev 2016-04-13 06:37:33 +00:00
Paul Jensen
3eb30186ae Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev am: 7e261a1
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
Paul Jensen
7e261a101a Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev 2016-04-13 01:33:37 +00:00
Trevor Johns
b3abe0614d Merge "Merge branch \'mnc-mr-docs\' into mnc-ub-dev am: 199565d -s ours am: 9262ac2" into nyc-dev-plus-aosp
am: ce2e35a

* commit 'ce2e35a1e1b63a1c45c0f249bf5d8586e1f9efc3': (546 commits)
  Update studio landing page and add all-new install flow docs. bug: 27850063 (update system reqs for 2.0) bug: 27725026 (update download page for 2.0) bug: 23908299 (clean up download and get started)
  docs: April 2016 Dashboard update
  docs: Added  new  partner logos to the car brands section of auto index page.
  Revert "Updates for Play" April Fool's joke.
  Updates for Play.
  docs: "Result is:" paragraph now in correct position on page.
  docs: Fixed namespace shown in a line of style XML
  docs: Add note about missing recording functionality in Live Channels
  docs: NDK r11c - release notes and downloads
  docs: Removed dead link in "create project" TOC.
  docs: Corrected reference link for NotificationManager.notify().
  docs: Added link to "preparing for multiwindow" blog post
  docs: Clarified how multi-window applies to activities in task stack
  [RenderScript] Update documentation about API level and RS Support Lib.
  cherrypick from mnc-docs docs: Updated API changes for Dinar wearable support.
  simplification and clarification to the Studio Overview
  Substitute for placeholder text.
  docs: Added missing semicolon within code sample.
  docs: Fixed Marshmallow links in API level table.
  docs: Update Nexus 9, 9G OTA images for N Preview
  ...

Change-Id: Id24c2a67c740bf8a4526473bfe1defdbb599c3f1
2016-04-12 22:37:15 +00:00
Dirk Dougherty
9262ac2d97 Merge branch \'mnc-mr-docs\' into mnc-ub-dev
am: 199565d  -s ours

* commit '199565d7a0656c0eae0eb626d3066fa3c1b7a74f': (546 commits)
  Update studio landing page and add all-new install flow docs. bug: 27850063 (update system reqs for 2.0) bug: 27725026 (update download page for 2.0) bug: 23908299 (clean up download and get started)
  docs: April 2016 Dashboard update
  docs: Added  new  partner logos to the car brands section of auto index page.
  Revert "Updates for Play" April Fool's joke.
  Updates for Play.
  docs: "Result is:" paragraph now in correct position on page.
  docs: Fixed namespace shown in a line of style XML
  docs: Add note about missing recording functionality in Live Channels
  docs: NDK r11c - release notes and downloads
  docs: Removed dead link in "create project" TOC.
  docs: Corrected reference link for NotificationManager.notify().
  docs: Added link to "preparing for multiwindow" blog post
  docs: Clarified how multi-window applies to activities in task stack
  [RenderScript] Update documentation about API level and RS Support Lib.
  cherrypick from mnc-docs docs: Updated API changes for Dinar wearable support.
  simplification and clarification to the Studio Overview
  Substitute for placeholder text.
  docs: Added missing semicolon within code sample.
  docs: Fixed Marshmallow links in API level table.
  docs: Update Nexus 9, 9G OTA images for N Preview
  ...

Change-Id: I2a64872d24ff2780503766f94e6d693edbdd47b8
2016-04-12 19:23:52 +00:00
Paul Jensen
6b866480f5 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
57f56137ea 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