diff options
| author | 2017-03-28 02:30:18 +0000 | |
|---|---|---|
| committer | 2017-03-28 02:30:18 +0000 | |
| commit | c5bca697ba60f1df2e182b56bca58295e672dbb8 (patch) | |
| tree | a537ac9bf57b2e2db062297dc37517749bf5f51d | |
| parent | 61f58f06767863907801299f134dd494543cf8b3 (diff) | |
| parent | 58406d1df20c7c550075e77f8f4922bda5661cc5 (diff) | |
Merge "Add null check to IpManager.dump()"
am: 58406d1df2
Change-Id: I68f644a305d58e1396522d73c0983e1eb201cb1c
| -rw-r--r-- | services/net/java/android/net/ip/IpManager.java | 2 |
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; |