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

Commit 5f4f8b9a authored by Alan Stokes's avatar Alan Stokes
Browse files

NetworkWatchListShellCommand: Close the input file 

We were leaking a PFD. Make sure we don't.

Fix: 172655953
Test: atest CtsNetTestCases:android.net.cts.NetworkWatchlistTest#testGetWatchlistConfigHash
Test: Run locally, verify no strict mode error seen.
Change-Id: I05590779f950e8400e8da7477049f8fe3779f0a0
parent cfa70cde

services/core/java/com/android/server/net/watchlist/NetworkWatchlistShellCommand.java

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