commit 0a998b84bc14ed17af50a80f45b23c99e349d58b
author Joe LaPenna <jlapenna@google.com> Fri Jul 04 17:15:54 2014 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Tue Jul 08 22:52:02 2014 +0000
tree a308422d9639acf973efcffc676105087b8e5ee3
parent aecbb5c7104e214ae801c1552504ec6d145fd330

CW on Master: Disable CaptivePortalTracker, EthernetService

BUG: 15143878

Change-Id: I6c534a28c1fcd475982ae70e7f3af69f3a219e24

core/java/android/net/EthernetManager.java

diff --git a/core/java/android/net/EthernetManager.java b/core/java/android/net/EthernetManager.java
index 5df4baf..608ca28 100644
--- a/core/java/android/net/EthernetManager.java
+++ b/core/java/android/net/EthernetManager.java
@@ -51,6 +51,11 @@
      * @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 @@
      * Set Ethernet configuration.
      */
     public void setConfiguration(IpConfiguration config) {
+        if (mService == null) {
+            return;
+        }
         try {
             mService.setConfiguration(config);
         } catch (RemoteException e) {