From 0a998b84bc14ed17af50a80f45b23c99e349d58b Mon Sep 17 00:00:00 2001
From: Joe LaPenna <jlapenna@google.com>
Date: Fri, 4 Jul 2014 17:15:54 -0700
Subject: [PATCH] CW on Master: Disable CaptivePortalTracker, EthernetService

BUG: 15143878

Change-Id: I6c534a28c1fcd475982ae70e7f3af69f3a219e24
---
 core/java/android/net/EthernetManager.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/java/android/net/EthernetManager.java b/core/java/android/net/EthernetManager.java
index 5df4bafc46..608ca28d84 100644
--- a/core/java/android/net/EthernetManager.java
+++ b/core/java/android/net/EthernetManager.java
@@ -51,6 +51,11 @@ public class EthernetManager {
      * @return the Ethernet Configuration, contained in {@link IpConfiguration}.
      */
     public IpConfiguration getConfiguration() {
+        if (mService == null) {
+            return new IpConfiguration(IpAssignment.UNASSIGNED,
+                                       ProxySettings.UNASSIGNED,
+                                       new LinkProperties());
+        }
         try {
             return mService.getConfiguration();
         } catch (RemoteException e) {
@@ -64,6 +69,9 @@ public class EthernetManager {
      * Set Ethernet configuration.
      */
     public void setConfiguration(IpConfiguration config) {
+        if (mService == null) {
+            return;
+        }
         try {
             mService.setConfiguration(config);
         } catch (RemoteException e) {