Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70e4d3c3 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by android-build-merger
Browse files

Merge "Fix bad arguments handling" am: 79a2b521

am: 8c64a5a4

Change-Id: If077f431c0e61691f2a8a8ffe2960a557050b198
parents 8413d304 8c64a5a4
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@
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;
@@ -26,7 +24,6 @@ import android.os.ShellCommand;
import android.provider.Settings;

import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;

@@ -74,10 +71,12 @@ class NetworkWatchlistShellCommand extends ShellCommand {
        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());