Commit Graph

2569 Commits

Author SHA1 Message Date
Andreas Gampe
ae941d00cc Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 2082480 am: 12aea50
am: 9739a46

* commit '9739a467db314fc2ba0538a958d1f8c1e2693f95':
  Frameworks/base: Make debug helper lazy in ConnectivityManager

Change-Id: Iae09599af115044fd6e1c37c0f0222fe766281f0
2016-04-26 16:15:18 +00:00
TreeHugger Robot
9739a467db Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 2082480
am: 12aea50

* commit '12aea502c103777317d6105f59365384034ced8a':
  Frameworks/base: Make debug helper lazy in ConnectivityManager

Change-Id: Ifc6094201f1c92b92465010ab6f965d7946ec0e7
2016-04-26 15:34:26 +00:00
TreeHugger Robot
2082480038 Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev 2016-04-26 15:25:44 +00:00
Jeff Sharkey
77247f65c3 resolve merge conflicts of afd09db to nyc-mr1-dev-plus-aosp
am: 6557b6a

* commit '6557b6af48ac48b8f8069b6b6012659610c6e097':

Change-Id: Iabdfc7e27557677158d6ff107c8e0ad27b1ddcea
2016-04-25 22:52:19 +00:00
Jeff Sharkey
00faf37463 resolve merge conflicts of d1153a3 to master
Change-Id: Iec9a4a76d0db0fbebdca8a732b4666cfaad70267
2016-04-25 16:40:38 -06:00
Jeff Sharkey
6557b6af48 resolve merge conflicts of afd09db to nyc-mr1-dev-plus-aosp
Change-Id: Ie8417362964aa2fb17941d870ffcb060d3e47ea1
2016-04-25 16:19:44 -06:00
Jeff Sharkey
16580a6028 resolve merge conflicts of c79a568 to nyc-dev-plus-aosp
Change-Id: I3ee02bc596f285fa41ffcafa882ae5997ef67d22
2016-04-25 15:53:50 -06:00
Jeff Sharkey
c0ffd5162f resolve merge conflicts of 59ad404 to nyc-mr1-dev-plus-aosp
Change-Id: I65f892594034c6de4ac17459c01e146fe4c4e377
2016-04-25 15:52:11 -06:00
Andreas Gampe
b704658951 Frameworks/base: Make debug helper lazy in ConnectivityManager
Place helper map for callback field names into a holder. This avoids
the reflective calls in static initialization of ConnectivityManager
in the common (non-debug) case, which means the class can be
compile-time initialized. Also saves the storage necessary (both
the storage array as well as the reflection metadata).

Follow-up to b027e6e92b.

Bug: 27265238
Change-Id: Ib4bfaf27acd234a035a5d198458340099a156a4c
2016-04-25 10:30:53 -07:00
Jeff Sharkey
40d1fb87a4 API changes for DownloadManager and JobScheduler.
To support moving DownloadManager, add new JobScheduler network type
constraint that matches "any network except roaming."  Also add an
API to get a specific JobInfo by ID.

Since the default network can be different on a per-app basis, and
individual apps may be blocked due to app standby, evaluate job
connectivity constraints on a per-UID basis.  To implement this
cleanly, add NetworkInfo.isMetered() to match the isRoaming() API.

Add new DownloadManager APIs to support charging and device idle
constraints, which are plumbed through to JobScheduler under the
hood when scheduled.

Add filtering to JobScheduler dumpsys to omit noisy details for
packages the caller isn't interested in.

Bug: 28098882, 26571724, 19821935
Change-Id: I09ca7184ef7ce6adba399f579d415a5fb2ea6110
2016-04-24 14:39:34 -06:00
Hugo Benichi
ba5c01a93e Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372 am: 76d7036002
am: c0c3258061

* commit 'c0c325806110da19407a9e2e18b4264febfba1f4':

Change-Id: Ifd69770e1971b8be80a69b040479abd3c0997c2b
2016-04-22 10:00:13 +00:00
Hugo Benichi
c0c3258061 Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372
am: 76d7036002

* commit '76d7036002dc7ad5297f5dc30e67709db475ed54':

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

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

Change-Id: I4cd3eeb25f63fe3731883ec2cc4fbfc3602bfba8
2016-04-22 09:55:38 +00:00
Hugo Benichi
c7dd9c517e 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
76d7036002 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
134a18cdea 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
fa28d8952f Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev am: eaa8684da7 am: 6a8a98c57a
am: 1b52fcfc1d

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

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

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

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

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

Change-Id: Ic664fa080316eff75dd22fc8e84431cb0eb903be
2016-04-21 13:54:53 +00:00
Paul Jensen
eaa8684da7 Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev 2016-04-21 13:47:13 +00:00
Hugo Benichi
55124f1079 Merge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: 6ab129c8e4" into nyc-mr1-dev-plus-aosp
am: 16220f6683

* commit '16220f66835d6bb6902e45819600ff169a16752c':

Change-Id: I4f344e75e4d2023df289f0e3479a95af2b933fc7
2016-04-21 04:20:01 +00:00
Hugo Benichi
c81ef07316 Merge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: 6ab129c8e4" into nyc-mr1-dev-plus-aosp
am: 072b629abf

* commit '072b629abf5d4b8c5533fc244611d489cb274541':

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

* commit '1e7c9fb57e25d22c2d5a48a590728f6bb7875360':
  Some fixes in ConnectivityService event logging

Change-Id: Icb50bdab260da6476c1d1148fa2d8995b106a809
2016-04-21 04:19:53 +00:00
Android Build Merger (Role)
16220f6683 Merge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: 6ab129c8e4" into nyc-mr1-dev-plus-aosp 2016-04-21 04:17:37 +00:00
Hugo Benichi
f6a016ed7e Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
am: 6ab129c8e4

* commit '6ab129c8e427daa7577d31ba3f77221fc2c584af':

Change-Id: I7d2861350744e3bdefe6f4315d9a6de79d136e1c
2016-04-21 04:17:08 +00:00
Android Build Merger (Role)
072b629abf Merge "Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: 6ab129c8e4" into nyc-mr1-dev-plus-aosp 2016-04-21 04:15:41 +00:00
Hugo Benichi
1e7c9fb57e 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
15570a55f3 Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
am: 6ab129c8e4

* commit '6ab129c8e427daa7577d31ba3f77221fc2c584af':
  Some fixes in ConnectivityService event logging

Change-Id: Ib605d0f63a4b7477d56508213da8663cb681b1ef
2016-04-21 04:15:07 +00:00
Hugo Benichi
6ab129c8e4 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
436d22e6b8 Some fixes in ConnectivityService event logging
Bug: 28204408
Change-Id: I44ed9539bb213a845c2bcc2861c947af7c3c9ef4
2016-04-21 11:03:08 +09:00
Felipe Leme
b52edda26a Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba am: 863b80d
am: f9ce6c8

* commit 'f9ce6c82ff2f06d6f55f181e50bfc4be2de4862a':

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

* commit '863b80d6072f0e2563ab87fe06fe26cd07724e4c':

Change-Id: I2b3381b6f351a3f9dffa2b0ae1c2d50688b9ad85
2016-04-20 21:42:40 +00:00
Felipe Leme
568afabb65 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba am: 0627850
am: 4988f49

* commit '4988f49b8399c23896cf77ac411af35f5c045b6e':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: Iae1c0af0aec6dba501249c0db08ade5a36f99607
2016-04-20 21:29:18 +00:00
TreeHugger Robot
4988f49b83 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
863b80d607 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
7b87065990 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
987d8ef741 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
f3c2b112b2 Merge "Remove unnecessary allocation+unboxing of objects. am: 46f0dd6 am: 93aa6a7" into nyc-mr1-dev-plus-aosp
am: ee87054

* commit 'ee8705494d54ddb031d72fc47695f5784387d06b':

Change-Id: I74383face9cb4a1a205799f226e2133050db5660
2016-04-18 10:42:33 +00:00
Narayan Kamath
c0465659b9 Remove unnecessary allocation+unboxing of objects. am: 46f0dd6 am: 4c89ae0
am: 1e222ff

* commit '1e222ff323abdf061a46bfb4d297780eadd0968d':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: Ic48935549f7f9b13d5f0a2d98fc0979fbfc5a38b
2016-04-18 10:42:28 +00:00
Android Build Merger (Role)
ee8705494d Merge "Remove unnecessary allocation+unboxing of objects. am: 46f0dd6 am: 93aa6a7" into nyc-mr1-dev-plus-aosp 2016-04-18 10:38:02 +00:00
Lorenzo Colitti
2b7db0cba5 resolve merge conflicts of 72fa0d4 to nyc-dev-plus-aosp am: 57f1e32
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
1e222ff323 Remove unnecessary allocation+unboxing of objects. am: 46f0dd6
am: 4c89ae0

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

Change-Id: I46f5ec0b9b8bc14073bcf7dc643bc909072d53ff
2016-04-18 10:36:37 +00:00
Narayan Kamath
93aa6a7f96 Remove unnecessary allocation+unboxing of objects.
am: 46f0dd6

* commit '46f0dd69cdbc4fd8bac8330425f79dca3be4d4a1':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: Idfffa8fad0f6bcffa954752910524bdc879d65b7
2016-04-18 10:31:37 +00:00
Lorenzo Colitti
57f1e32f15 resolve merge conflicts of 72fa0d4 to nyc-dev-plus-aosp
Change-Id: Id7f317a20e422b215efff89a5c71c9b445d18cf4
2016-04-18 17:58:31 +09:00
Narayan Kamath
46f0dd69cd 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
b10b854bd3 Disambiguate NetworkCallback JavaDoc. am: 15874cd
am: c8a0754

* commit 'c8a0754b3d98e90a869acb9dcc8ca8ae40bcbde1':
  Disambiguate NetworkCallback JavaDoc.

Change-Id: Ibf47574237ea8467d8e536395d580bac9f8fea36
2016-04-15 09:54:58 +00:00
Lorenzo Colitti
15874cd028 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
8756817fb4 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
a6b1155d31 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
abdd3f8a9f Also log IPv4 and IPv6 connectivity of any previous default network
Change-Id: I07595c0a131fea21914f524949cd64af87403b88
2016-04-14 17:54:46 +09:00