Merge "Fix bad arguments handling"

package com.android.server.net.watchlist;

import android.content.Context;

import android.content.Intent;

import android.net.NetworkWatchlistManager;

import android.os.Binder;

import android.os.ParcelFileDescriptor;

import android.os.RemoteException;

import android.provider.Settings;

import java.io.FileInputStream;

import java.io.IOException;

import java.io.InputStream;

import java.io.PrintWriter;

        try {

            final String configXmlPath = getNextArgRequired();

            final ParcelFileDescriptor pfd = openFileForSystem(configXmlPath, "r");

            if (pfd != null) {

            if (pfd == null) {

                pw.println("Error: can't open input file " + configXmlPath);

                return -1;

            }

            final InputStream fileStream = new FileInputStream(pfd.getFileDescriptor());

            WatchlistConfig.getInstance().setTestMode(fileStream);

            }

            pw.println("Success!");

        } catch (Exception ex) {

            pw.println("Error: " + ex.toString());