Merge "Add null check to IpManager.dump()" am: 58406d1df2 (e398bae5) · Commits · e / os / android_frameworks_base

services/net/java/android/net/ip/IpManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;