Felipe Leme
592b192482
Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev am: 5af619f am: 7f026f8
...
am: 33ec772
2016-04-28 00:52:46 +00:00
TreeHugger Robot
33ec77265a
Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev am: 5af619f
...
am: 7f026f8
2016-04-27 23:40:42 +00:00
Felipe Leme
7f026f8927
Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev
...
am: 5af619f
2016-04-27 23:31:49 +00:00
TreeHugger Robot
5af619f1cd
Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev
2016-04-27 22:41:13 +00:00
TreeHugger Robot
593b7b91e7
Merge "Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: 6333d09 am: d00f83f" into nyc-mr1-dev-plus-aosp
...
am: ca295bc
2016-04-27 02:52:23 +00:00
Hugo Benichi
94e974e90c
Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: 6333d09 am: bd858ec
...
am: e0f0a9c
2016-04-27 02:51:44 +00:00
Android Build Merger (Role)
ca295bc1e0
Merge "Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: 6333d09 am: d00f83f" into nyc-mr1-dev-plus-aosp
2016-04-27 02:02:03 +00:00
TreeHugger Robot
deb90020d9
Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: 6333d09
...
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
e0f0a9cbde
Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: 6333d09
...
am: bd858ec
2016-04-27 02:01:11 +00:00
Hugo Benichi
bd858ec5d9
Merge changes I8de95add,Ia6f4ccfd into nyc-dev
...
am: 6333d09
2016-04-27 01:57:13 +00:00
TreeHugger Robot
6333d09474
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
e51bf9e2a4
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
17a63c4aaa
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 2082480 am: 6915561
...
am: 566531c
2016-04-26 16:15:50 +00:00
Andreas Gampe
ae941d00cc
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 2082480 am: 12aea50
...
am: 9739a46
2016-04-26 16:15:18 +00:00
TreeHugger Robot
566531cd9c
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 2082480
...
am: 6915561
2016-04-26 15:37:28 +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
Andreas Gampe
69155619b9
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev
...
am: 2082480
2016-04-26 15:31:11 +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
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
Felipe Leme
9842878b75
Tethering and Data Saver: There Can Be Only One!
...
If tethering is on when Data Saver mode is turned on, tethering should
be disabled, and vice-versa.
BUG: 28313291
Change-Id: I7f3dadbd97ea1492ab76b41043dea7487c1db02d
2016-04-25 15:36:25 -07: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
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
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
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
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
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
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
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
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
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
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
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
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
2016-04-20 23:15:06 +00:00
TreeHugger Robot
f9ce6c82ff
Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba
...
am: 863b80d
2016-04-20 21:42:40 +00:00
Felipe Leme
568afabb65
Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba am: 0627850
...
am: 4988f49
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
