Merge "Add null check to IpManager.dump()"

am: 58406d1df2

Change-Id: I68f644a305d58e1396522d73c0983e1eb201cb1c
This commit is contained in:
Erik Kline
2017-03-28 02:30:18 +00:00
committed by android-build-merger

View File

@@ -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;