Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check to IpManager.dump()" am: 58406d1df2

Browse Source 
am: c5bca697ba

Change-Id: Id5ebbea0c64baa24d162c0545d45915c948f45e6
This commit is contained in:
Erik Kline
2017-03-28 02:34:15 +00:00
committed by android-build-merger
parent 8e94d9e32d c5bca697ba
commit e398bae572
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/net/java/android/net/ip/IpManager.java
View File

@@ -608,7 +608,7 @@ public class IpManager extends StateMachine {
} }
public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { 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. // Execute confirmConfiguration() and take no further action.
confirmConfiguration(); confirmConfiguration();
return; return;