CW on Master: Disable CaptivePortalTracker, EthernetService

BUG: 15143878 Change-Id: I6c534a28c1fcd475982ae70e7f3af69f3a219e24
2014-07-04 17:15:54 -07:00
parent aecbb5c710
commit 0a998b84bc
1 changed files with 8 additions and 0 deletions
--- 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) {