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

Commit ec1f9ac7 authored Mar 30, 2016 by Pierre Imai Committed by android-build-merger Mar 30, 2016

Merge "Move connectivity events to frameworks/base." into nyc-dev am: bc786b74

am: 132ffdcf

* commit '132ffdcf':
  Move connectivity events to frameworks/base.

Change-Id: Ibb7b6bd844f848db96994b8c8ee9032b35ae67b0

parents e2a98cd8 132ffdcf

services/net/java/android/net/metrics/CaptivePortalCheckResultEvent.java→core/java/android/net/metrics/CaptivePortalCheckResultEvent.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,9 @@ package android.net.metrics;
		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* {@hide}
		*/
		public class CaptivePortalCheckResultEvent extends IpConnectivityEvent implements Parcelable {
		public static final String TAG = "CaptivePortalCheckResultEvent";

services/net/java/android/net/metrics/CaptivePortalStateChangeEvent.java→core/java/android/net/metrics/CaptivePortalStateChangeEvent.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,9 @@ package android.net.metrics;
		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* {@hide}
		*/
		public class CaptivePortalStateChangeEvent extends IpConnectivityEvent implements Parcelable {
		public static final String TAG = "CaptivePortalStateChangeEvent";

services/net/java/android/net/metrics/ConnectivityServiceChangeEvent.java→core/java/android/net/metrics/ConnectivityServiceChangeEvent.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,9 @@ package android.net.metrics;
		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* {@hide}
		*/
		public class ConnectivityServiceChangeEvent extends IpConnectivityEvent implements Parcelable {
		public static final String TAG = "ConnectivityServiceChangeEvent";

services/net/java/android/net/metrics/DhcpClientEvent.java→core/java/android/net/metrics/DhcpClientEvent.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,9 @@ package android.net.metrics;
		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* {@hide}
		*/
		public class DhcpClientEvent extends IpConnectivityEvent implements Parcelable {
		public static final String TAG = "DhcpClientEvent";

services/net/java/android/net/metrics/IpConnectivityEvent.java→core/java/android/net/metrics/IpConnectivityEvent.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,9 @@ import android.net.ConnectivityMetricsLogger;
		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* {@hide}
		*/
		public class IpConnectivityEvent implements Parcelable {
		// IPRM = IpReachabilityMonitor
		// DHCP = DhcpClient