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

Merge "NetworkWatchListShellCommand: Close the input file"

Browse Source
This commit is contained in:
Alan Stokes
2020-11-09 11:06:44 +00:00
committed by Android (Google) Code Review
parent 11cbe5ff61 5f4f8b9ab1
commit 65f022905d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/net/watchlist/NetworkWatchlistShellCommand.java
View File

@@ -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());