diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-26 01:35:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-26 01:35:39 -0700 |
| commit | 7460591a57a2ea585eec410a5d0112e8427d78c9 (patch) | |
| tree | 9e3880e7a64f211c96e900612ab36b78b8fccb6d /core/java | |
| parent | bfc57acdb8789a97300fee3daecb31072d90bd44 (diff) | |
| parent | 759efacd2d1cf70d10f66fb9656de656ac8ca867 (diff) | |
| download | frameworks_base-7460591a57a2ea585eec410a5d0112e8427d78c9.zip frameworks_base-7460591a57a2ea585eec410a5d0112e8427d78c9.tar.gz frameworks_base-7460591a57a2ea585eec410a5d0112e8427d78c9.tar.bz2 | |
am 759efacd: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
* commit '759efacd2d1cf70d10f66fb9656de656ac8ca867':
Make new networkAttribute parameter non-optional.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/NetworkConfig.java | 6 |
1 files changed, 1 insertions, 5 deletions
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 @@ public class NetworkConfig { 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]); } /** |