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

Merge "Fix bad arguments handling" am: 79a2b5215d am: 8c64a5a4ff

Browse Source 
am: 70e4d3c3a2

Change-Id: Iab78aec4281338c13d99cf9ab168699d1c24915c
This commit is contained in:
Tomasz Wasilczyk
2019-07-08 18:08:30 -07:00
committed by android-build-merger
parent 8d32fefac4 70e4d3c3a2
commit 8f0da80b26
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,8 +17,6 @@
package com.android.server.net.watchlist; package com.android.server.net.watchlist;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.net.NetworkWatchlistManager;
import android.os.Binder; import android.os.Binder;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.RemoteException; import android.os.RemoteException;
@@ -26,7 +24,6 @@ import android.os.ShellCommand;
import android.provider.Settings; import android.provider.Settings;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
@@ -74,10 +71,12 @@ class NetworkWatchlistShellCommand extends ShellCommand {
try { try {
final String configXmlPath = getNextArgRequired(); final String configXmlPath = getNextArgRequired();
final ParcelFileDescriptor pfd = openFileForSystem(configXmlPath, "r"); 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()); final InputStream fileStream = new FileInputStream(pfd.getFileDescriptor());
WatchlistConfig.getInstance().setTestMode(fileStream); WatchlistConfig.getInstance().setTestMode(fileStream);
}
pw.println("Success!"); pw.println("Success!");
} catch (Exception ex) { } catch (Exception ex) {
pw.println("Error: " + ex.toString()); pw.println("Error: " + ex.toString());