summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2017-03-28 02:19:21 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-03-28 02:19:22 +0000
commit58406d1df20c7c550075e77f8f4922bda5661cc5 (patch)
tree72fd99e27b17fcbb5d16d053f3d3ef0cbe6b30f9
parent97bdedf655240222afdb61d76778a558bb092919 (diff)
parent0ea70fc38b5ad7979ee2947fe611b2fd89e2c675 (diff)
Merge "Add null check to IpManager.dump()"
-rw-r--r--services/net/java/android/net/ip/IpManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/net/java/android/net/ip/IpManager.java b/services/net/java/android/net/ip/IpManager.java
index 3e3a19b8effd..4addbfc21d74 100644
--- a/services/net/java/android/net/ip/IpManager.java
+++ b/services/net/java/android/net/ip/IpManager.java
@@ -608,7 +608,7 @@ public class IpManager extends StateMachine {
}
public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
- if (args.length > 0 && DUMP_ARG_CONFIRM.equals(args[0])) {
+ if (args != null && args.length > 0 && DUMP_ARG_CONFIRM.equals(args[0])) {
// Execute confirmConfiguration() and take no further action.
confirmConfiguration();
return;