commit ef903acab42c4bf96c7ee4062ea6b1c34648b481
author Robert Greenwalt <rgreenwalt@google.com> Tue Apr 26 01:35:39 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 26 01:35:39 2011 -0700
tree 8ea946871f207a595062f3feeff60160f092dfa6
parent f76c55d2897565a3b05e4d9392987326a1a7261e
parent 8177aee2dc06601701d0ed8e8efb20ed787e6153

am 8177aee2: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE

* commit '8177aee2dc06601701d0ed8e8efb20ed787e6153':
  Make new networkAttribute parameter non-optional.

core/java/android/net/NetworkConfig.java

diff --git a/core/java/android/net/NetworkConfig.java b/core/java/android/net/NetworkConfig.java
index 4adb76b..6e774a6 100644
--- a/core/java/android/net/NetworkConfig.java
+++ b/core/java/android/net/NetworkConfig.java
@@ -60,11 +60,7 @@
         type = Integer.parseInt(fragments[1]);
         radio = Integer.parseInt(fragments[2]);
         priority = Integer.parseInt(fragments[3]);
-        if (fragments.length > 4) {
-            dependencyMet = Boolean.parseBoolean(fragments[4]);
-        } else {
-            dependencyMet = true;
-        }
+        dependencyMet = Boolean.parseBoolean(fragments[4]);
     }
 
     /**