TreeHugger Robot
62d8813a79
Merge "Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: f2f244a am: d00f83f" into nyc-mr1-dev-plus-aosp
...
am: cb8494c
2016-04-27 02:52:23 +00:00
Hugo Benichi
f94f0b0fa5
Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: f2f244a am: 27f44c4
...
am: aa9e2ee
2016-04-27 02:51:44 +00:00
Android Build Merger (Role)
cb8494ca4e
Merge "Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: f2f244a am: d00f83f" into nyc-mr1-dev-plus-aosp
2016-04-27 02:02:03 +00:00
TreeHugger Robot
cbc95c7b5c
Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: f2f244a
...
am: d00f83f
* commit 'd00f83f56024ddcce1d42a03c6a27f317ccab7f3':
Remove unused event tags of IpConnectivityEvent
Better ConnectivityMetricsEvent printing
Change-Id: I7b9588ab0533963ed918ec8aee7ba7c4ec1dea0a
2016-04-27 02:01:14 +00:00
TreeHugger Robot
aa9e2ee4b6
Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: f2f244a
...
am: 27f44c4
2016-04-27 02:01:11 +00:00
Hugo Benichi
27f44c4704
Merge changes I8de95add,Ia6f4ccfd into nyc-dev
...
am: f2f244a
2016-04-27 01:57:13 +00:00
TreeHugger Robot
f2f244aa21
Merge changes I8de95add,Ia6f4ccfd into nyc-dev
...
* changes:
Remove unused event tags of IpConnectivityEvent
Better ConnectivityMetricsEvent printing
2016-04-27 01:49:53 +00:00
Hugo Benichi
c41a4e4266
Better ConnectivityMetricsEvent printing
...
This patch adds more information printing for IpConnectivity event
classes in android.net.metrics.
example:
ConnectivityMetricsEvent(14:36:35.799, 0, 1026): DhcpClientEvent(wlan0, DhcpRequestingState)
ConnectivityMetricsEvent(14:36:35.805, 0, 1026): DhcpClientEvent(wlan0, DhcpHaveAddressState)
ConnectivityMetricsEvent(14:36:35.809, 0, 4096): IpManagerEvent(wlan0, PROVISIONING_OK, 155ms)
ConnectivityMetricsEvent(14:36:35.810, 0, 1026): DhcpClientEvent(wlan0, DhcpBoundState)
ConnectivityMetricsEvent(14:36:35.871, 0, 2048): NetworkEvent(101, NETWORK_CONNECTED, 0ms)
ConnectivityMetricsEvent(14:36:35.874, 0, 2051): ValidationProbeEvent(101, PROBE_HTTP:599, 3ms)
ConnectivityMetricsEvent(14:36:35.874, 0, 2048): NetworkEvent(101, NETWORK_VALIDATION_FAILED, 0ms)
ConnectivityMetricsEvent(14:36:35.928, 0, 3072): DefaultNetworkEvent(0 -> 101, [WIFI], IPv4: false, IPv6: false)
ConnectivityMetricsEvent(14:36:37.008, 0, 2051): ValidationProbeEvent(101, PROBE_HTTP:204, 134ms)
ConnectivityMetricsEvent(14:36:37.008, 0, 2050): NetworkEvent(101, NETWORK_VALIDATED, 1137ms)
Also fixes a couple of event logging issues:
- do no record spurious receive DhcpErrorEvent when a network goes down.
- add an eventType field to IpManagerEvent instead of using the
loggger component tag.
Bug: 28204408
Change-Id: Ia6f4ccfd7a0c63a5ccec18825f226c0b5781217b
2016-04-27 09:11:29 +09:00
Andreas Gampe
1944faf41a
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 9eabb38 am: 400a090
...
am: a5f54d7
2016-04-26 16:15:50 +00:00
Andreas Gampe
ae3f78707e
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 9eabb38 am: 12aea50
...
am: e0f1d13
2016-04-26 16:15:18 +00:00
TreeHugger Robot
a5f54d7174
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 9eabb38
...
am: 400a090
2016-04-26 15:37:28 +00:00
TreeHugger Robot
e0f1d13cb6
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 9eabb38
...
am: 12aea50
* commit '12aea502c103777317d6105f59365384034ced8a':
Frameworks/base: Make debug helper lazy in ConnectivityManager
Change-Id: Ifc6094201f1c92b92465010ab6f965d7946ec0e7
2016-04-26 15:34:26 +00:00
Andreas Gampe
400a0902c9
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev
...
am: 9eabb38
2016-04-26 15:31:11 +00:00
TreeHugger Robot
9eabb38b7f
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev
2016-04-26 15:25:44 +00:00
Jeff Sharkey
d586532eac
resolve merge conflicts of afd09db to nyc-mr1-dev-plus-aosp
...
am: a977eb3
2016-04-25 22:52:19 +00:00
Jeff Sharkey
8876393960
resolve merge conflicts of d1153a3 to master
...
Change-Id: Iec9a4a76d0db0fbebdca8a732b4666cfaad70267
2016-04-25 16:40:38 -06:00
Jeff Sharkey
a977eb3ea1
resolve merge conflicts of afd09db to nyc-mr1-dev-plus-aosp
...
Change-Id: Ie8417362964aa2fb17941d870ffcb060d3e47ea1
2016-04-25 16:19:44 -06:00
Jeff Sharkey
a35dd995f2
resolve merge conflicts of c79a568 to nyc-dev-plus-aosp
...
Change-Id: I3ee02bc596f285fa41ffcafa882ae5997ef67d22
2016-04-25 15:53:50 -06:00
Jeff Sharkey
d985d3f505
resolve merge conflicts of 59ad404 to nyc-mr1-dev-plus-aosp
...
Change-Id: I65f892594034c6de4ac17459c01e146fe4c4e377
2016-04-25 15:52:11 -06:00
Andreas Gampe
9537278b82
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 7e28683228
2016-04-25 10:30:53 -07:00
Jeff Sharkey
ea4037847d
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
bcae090f71
Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372 am: a89d8bbc8d
...
am: 5fb9102975
2016-04-22 10:00:13 +00:00
Hugo Benichi
5fb9102975
Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372
...
am: a89d8bbc8d
2016-04-22 09:55:38 +00:00
Hugo Benichi
369984c2e3
Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372 am: cbb0d77bcd
...
am: 0c1f013ba2
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
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
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
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
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
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
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
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
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
2016-04-20 23:15:06 +00:00
TreeHugger Robot
79dd1fa78b
Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba
...
am: c1eafaf
2016-04-20 21:42:40 +00:00
Felipe Leme
096a5e302a
Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba am: 0627850
...
am: 87fef43
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
2016-04-18 10:42:33 +00:00
Narayan Kamath
39c3aba0e0
Remove unnecessary allocation+unboxing of objects. am: 846fa3e am: 4c89ae0
...
am: 83da731
2016-04-18 10:42:28 +00:00
