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

Commit 65f02290 authored by Alan Stokes's avatar Alan Stokes Committed by Android (Google) Code Review
Browse files

Merge "NetworkWatchListShellCommand: Close the input file"

parents 11cbe5ff 5f4f8b9a
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.os.RemoteException;
import android.os.ShellCommand;
import android.provider.Settings;

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

@@ -75,8 +74,9 @@ class NetworkWatchlistShellCommand extends ShellCommand {
                pw.println("Error: can't open input file " + configXmlPath);
                return -1;
            }
            final InputStream fileStream = new FileInputStream(pfd.getFileDescriptor());
            WatchlistConfig.getInstance().setTestMode(fileStream);
            try (InputStream inputStream = new ParcelFileDescriptor.AutoCloseInputStream(pfd)) {
                WatchlistConfig.getInstance().setTestMode(inputStream);
            }
            pw.println("Success!");
        } catch (Exception ex) {
            pw.println("Error: " + ex.toString());