From bc9cc50947c129d11a282198ac458ffb82fef5bd Mon Sep 17 00:00:00 2001 From: Pierre Imai Date: Tue, 29 Mar 2016 14:50:51 +0900 Subject: [PATCH] Move connectivity events to frameworks/base. Fixes a crash in bluetooth' DhcpClient due to Class(not)Loader. Change-Id: I318c033aa8782c27a243104f85950adbf07d03a6 BUG: 27885860 BUG: 25691077 --- .../android/net/metrics/CaptivePortalCheckResultEvent.java | 3 +++ .../android/net/metrics/CaptivePortalStateChangeEvent.java | 3 +++ .../android/net/metrics/ConnectivityServiceChangeEvent.java | 3 +++ .../net => core}/java/android/net/metrics/DhcpClientEvent.java | 3 +++ .../java/android/net/metrics/IpConnectivityEvent.java | 3 +++ .../android/net/metrics/IpReachabilityMonitorMessageEvent.java | 3 +++ .../android/net/metrics/IpReachabilityMonitorProbeEvent.java | 3 +++ 7 files changed, 21 insertions(+) rename {services/net => core}/java/android/net/metrics/CaptivePortalCheckResultEvent.java (99%) rename {services/net => core}/java/android/net/metrics/CaptivePortalStateChangeEvent.java (99%) rename {services/net => core}/java/android/net/metrics/ConnectivityServiceChangeEvent.java (98%) rename {services/net => core}/java/android/net/metrics/DhcpClientEvent.java (98%) rename {services/net => core}/java/android/net/metrics/IpConnectivityEvent.java (99%) rename {services/net => core}/java/android/net/metrics/IpReachabilityMonitorMessageEvent.java (99%) rename {services/net => core}/java/android/net/metrics/IpReachabilityMonitorProbeEvent.java (99%) diff --git a/services/net/java/android/net/metrics/CaptivePortalCheckResultEvent.java b/core/java/android/net/metrics/CaptivePortalCheckResultEvent.java similarity index 99% rename from services/net/java/android/net/metrics/CaptivePortalCheckResultEvent.java rename to core/java/android/net/metrics/CaptivePortalCheckResultEvent.java index 163f7e40c7a05..2239a254c8a02 100644 --- a/services/net/java/android/net/metrics/CaptivePortalCheckResultEvent.java +++ b/core/java/android/net/metrics/CaptivePortalCheckResultEvent.java @@ -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"; diff --git a/services/net/java/android/net/metrics/CaptivePortalStateChangeEvent.java b/core/java/android/net/metrics/CaptivePortalStateChangeEvent.java similarity index 99% rename from services/net/java/android/net/metrics/CaptivePortalStateChangeEvent.java rename to core/java/android/net/metrics/CaptivePortalStateChangeEvent.java index d0cc120c5c5a9..00808c1800694 100644 --- a/services/net/java/android/net/metrics/CaptivePortalStateChangeEvent.java +++ b/core/java/android/net/metrics/CaptivePortalStateChangeEvent.java @@ -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"; diff --git a/services/net/java/android/net/metrics/ConnectivityServiceChangeEvent.java b/core/java/android/net/metrics/ConnectivityServiceChangeEvent.java similarity index 98% rename from services/net/java/android/net/metrics/ConnectivityServiceChangeEvent.java rename to core/java/android/net/metrics/ConnectivityServiceChangeEvent.java index 92b376c664440..c6fcb2d5c7136 100644 --- a/services/net/java/android/net/metrics/ConnectivityServiceChangeEvent.java +++ b/core/java/android/net/metrics/ConnectivityServiceChangeEvent.java @@ -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"; diff --git a/services/net/java/android/net/metrics/DhcpClientEvent.java b/core/java/android/net/metrics/DhcpClientEvent.java similarity index 98% rename from services/net/java/android/net/metrics/DhcpClientEvent.java rename to core/java/android/net/metrics/DhcpClientEvent.java index 2c240344871be..7b4466439e689 100644 --- a/services/net/java/android/net/metrics/DhcpClientEvent.java +++ b/core/java/android/net/metrics/DhcpClientEvent.java @@ -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"; diff --git a/services/net/java/android/net/metrics/IpConnectivityEvent.java b/core/java/android/net/metrics/IpConnectivityEvent.java similarity index 99% rename from services/net/java/android/net/metrics/IpConnectivityEvent.java rename to core/java/android/net/metrics/IpConnectivityEvent.java index f277bd07bdab2..ec428909e1cb7 100644 --- a/services/net/java/android/net/metrics/IpConnectivityEvent.java +++ b/core/java/android/net/metrics/IpConnectivityEvent.java @@ -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 diff --git a/services/net/java/android/net/metrics/IpReachabilityMonitorMessageEvent.java b/core/java/android/net/metrics/IpReachabilityMonitorMessageEvent.java similarity index 99% rename from services/net/java/android/net/metrics/IpReachabilityMonitorMessageEvent.java rename to core/java/android/net/metrics/IpReachabilityMonitorMessageEvent.java index a8c18d6f7d9ea..e71b0bedd36ed 100644 --- a/services/net/java/android/net/metrics/IpReachabilityMonitorMessageEvent.java +++ b/core/java/android/net/metrics/IpReachabilityMonitorMessageEvent.java @@ -19,6 +19,9 @@ package android.net.metrics; import android.os.Parcel; import android.os.Parcelable; +/** + * {@hide} + */ public class IpReachabilityMonitorMessageEvent extends IpConnectivityEvent implements Parcelable { public static final String TAG = "IpReachabilityMonitorMessageEvent"; diff --git a/services/net/java/android/net/metrics/IpReachabilityMonitorProbeEvent.java b/core/java/android/net/metrics/IpReachabilityMonitorProbeEvent.java similarity index 99% rename from services/net/java/android/net/metrics/IpReachabilityMonitorProbeEvent.java rename to core/java/android/net/metrics/IpReachabilityMonitorProbeEvent.java index 172cbf858c8b1..182b7780241c6 100644 --- a/services/net/java/android/net/metrics/IpReachabilityMonitorProbeEvent.java +++ b/core/java/android/net/metrics/IpReachabilityMonitorProbeEvent.java @@ -19,6 +19,9 @@ package android.net.metrics; import android.os.Parcel; import android.os.Parcelable; +/** + * {@hide} + */ public class IpReachabilityMonitorProbeEvent extends IpConnectivityEvent implements Parcelable { public static final String TAG = "IpReachabilityMonitorProbeEvent";