Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53095bb5 authored Jan 27, 2017 by The Android Automerger

Merge commit 'a19056c3' into nyc-mr1-dev-plus-aosp

* commit 'a19056c3': (35 commits)
  NetworkMonitor: send one DNS probe per web probe
  NetworkMonitor metrics: add first validation information
  APF: also drop any ICMPv6 RSs
  ConnectivityServiceTest: fix testAvoidBadWifiSettings
  Fix ConnectivityServiceTest testRequestBenchmark
  Switch over to new "time.android.com" NTP pool.
  Define API for metering network stats buckets.
  Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
  Use @Ignore to explicitly disable a @Test method.
  Fixed NetworkStatsServiceTest and converted it to JUnit4.
  VPN network stat accounting changes.
  ConnectivityThread: use lazy holder idiom
  ConnectivityManager: use ConnectivityThread looper
  ConnectivityManager: a simpler CallbackHandler
  Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
  Add a null check for the OnStartTetheringCallback.
  TokenBucket for rate-limiting and throttling
  IpConnectivityMetrics reads buffer size in settings
  CaptivePortalLogin: set mixed content policy to compatibility.
  Add IP conn metrics to dumpsys and bug reports
  ...

parents 798e1862 a19056c3

Android.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,7 @@ LOCAL_SRC_FILES += \
	core/java/android/app/admin/SecurityLogTags.logtags \		core/java/android/app/admin/SecurityLogTags.logtags \
	core/java/android/content/EventLogTags.logtags \		core/java/android/content/EventLogTags.logtags \
	core/java/android/speech/tts/EventLogTags.logtags \		core/java/android/speech/tts/EventLogTags.logtags \
			core/java/android/net/EventLogTags.logtags \
	core/java/android/webkit/EventLogTags.logtags \		core/java/android/webkit/EventLogTags.logtags \
	core/java/com/android/internal/logging/EventLogTags.logtags \		core/java/com/android/internal/logging/EventLogTags.logtags \

]

0 → 100644

+12 −0

Original line number	Original line	Diff line number	Diff line
			NetworkNotificationManager: logging improvements

			TODO: squash me
			# Please enter the commit message for your changes. Lines starting
			# with '#' will be ignored, and an empty message aborts the commit.
			# On branch notification_tagging
			# Your branch is ahead of 'goog/master' by 2 commits.
			# (use "git push" to publish your local commits)
			#
			# Changes to be committed:
			# modified: services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
			#

api/current.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6448,6 +6448,7 @@ package android.app.usage {
	public static class NetworkStats.Bucket {		public static class NetworkStats.Bucket {
	ctor public NetworkStats.Bucket();		ctor public NetworkStats.Bucket();
	method public long getEndTimeStamp();		method public long getEndTimeStamp();
			method public int getMetered();
	method public int getRoaming();		method public int getRoaming();
	method public long getRxBytes();		method public long getRxBytes();
	method public long getRxPackets();		method public long getRxPackets();
	@@ -6457,6 +6458,9 @@ package android.app.usage {
	method public long getTxBytes();		method public long getTxBytes();
	method public long getTxPackets();		method public long getTxPackets();
	method public int getUid();		method public int getUid();
			field public static final int METERED_ALL = -1; // 0xffffffff
			field public static final int METERED_NO = 1; // 0x1
			field public static final int METERED_YES = 2; // 0x2
	field public static final int ROAMING_ALL = -1; // 0xffffffff		field public static final int ROAMING_ALL = -1; // 0xffffffff
	field public static final int ROAMING_NO = 1; // 0x1		field public static final int ROAMING_NO = 1; // 0x1
	field public static final int ROAMING_YES = 2; // 0x2		field public static final int ROAMING_YES = 2; // 0x2

api/system-current.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6743,6 +6743,7 @@ package android.app.usage {
	public static class NetworkStats.Bucket {		public static class NetworkStats.Bucket {
	ctor public NetworkStats.Bucket();		ctor public NetworkStats.Bucket();
	method public long getEndTimeStamp();		method public long getEndTimeStamp();
			method public int getMetered();
	method public int getRoaming();		method public int getRoaming();
	method public long getRxBytes();		method public long getRxBytes();
	method public long getRxPackets();		method public long getRxPackets();
	@@ -6752,6 +6753,9 @@ package android.app.usage {
	method public long getTxBytes();		method public long getTxBytes();
	method public long getTxPackets();		method public long getTxPackets();
	method public int getUid();		method public int getUid();
			field public static final int METERED_ALL = -1; // 0xffffffff
			field public static final int METERED_NO = 1; // 0x1
			field public static final int METERED_YES = 2; // 0x2
	field public static final int ROAMING_ALL = -1; // 0xffffffff		field public static final int ROAMING_ALL = -1; // 0xffffffff
	field public static final int ROAMING_NO = 1; // 0x1		field public static final int ROAMING_NO = 1; // 0x1
	field public static final int ROAMING_YES = 2; // 0x2		field public static final int ROAMING_YES = 2; // 0x2

api/test-current.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6457,6 +6457,7 @@ package android.app.usage {
	public static class NetworkStats.Bucket {		public static class NetworkStats.Bucket {
	ctor public NetworkStats.Bucket();		ctor public NetworkStats.Bucket();
	method public long getEndTimeStamp();		method public long getEndTimeStamp();
			method public int getMetered();
	method public int getRoaming();		method public int getRoaming();
	method public long getRxBytes();		method public long getRxBytes();
	method public long getRxPackets();		method public long getRxPackets();
	@@ -6466,6 +6467,9 @@ package android.app.usage {
	method public long getTxBytes();		method public long getTxBytes();
	method public long getTxPackets();		method public long getTxPackets();
	method public int getUid();		method public int getUid();
			field public static final int METERED_ALL = -1; // 0xffffffff
			field public static final int METERED_NO = 1; // 0x1
			field public static final int METERED_YES = 2; // 0x2
	field public static final int ROAMING_ALL = -1; // 0xffffffff		field public static final int ROAMING_ALL = -1; // 0xffffffff
	field public static final int ROAMING_NO = 1; // 0x1		field public static final int ROAMING_NO = 1; // 0x1
	field public static final int ROAMING_YES = 2; // 0x2		field public static final int ROAMING_YES = 2; // 0x2