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

Merge "Avoid NullPointerException on non-existing file."

Browse Source
This commit is contained in:
Treehugger Robot
2020-11-05 18:13:18 +00:00
committed by Gerrit Code Review
parent 49612b38d8 2d510d9b6c
commit 5db706a48f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/utils/hostutils/src/com/android/internal/util/test/SystemPreparer.java
View File

@@ -186,7 +186,7 @@ public class SystemPreparer extends ExternalResource {
private File copyResourceToTemp(String resourcePath) throws IOException { private File copyResourceToTemp(String resourcePath) throws IOException {
final File tempFile = mHostTempFolder.newFile(); final File tempFile = mHostTempFolder.newFile();
final ClassLoader classLoader = getClass().getClassLoader(); final ClassLoader classLoader = getClass().getClassLoader();
try (InputStream assetIs = classLoader.getResource(resourcePath).openStream(); try (InputStream assetIs = classLoader.getResourceAsStream(resourcePath);
FileOutputStream assetOs = new FileOutputStream(tempFile)) { FileOutputStream assetOs = new FileOutputStream(tempFile)) {
if (assetIs == null) { if (assetIs == null) {
throw new IllegalStateException("Failed to find resource " + resourcePath); throw new IllegalStateException("Failed to find resource " + resourcePath);