Merge "Close the FileStream to avoid resource leak" (c54117c7) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/input/InputManagerService.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -2026,8 +2026,7 @@ public class InputManagerService extends IInputManager.Stub
		};
		for (File baseDir: baseDirs) {
		File confFile = new File(baseDir, EXCLUDED_DEVICES_PATH);
		try {
		InputStream stream = new FileInputStream(confFile);
		try (InputStream stream = new FileInputStream(confFile)) {
		names.addAll(ConfigurationProcessor.processExcludedDeviceNames(stream));
		} catch (FileNotFoundException e) {
		// It's ok if the file does not exist.
		@@ -2060,8 +2059,7 @@ public class InputManagerService extends IInputManager.Stub
		final File baseDir = Environment.getVendorDirectory();
		final File confFile = new File(baseDir, PORT_ASSOCIATIONS_PATH);

		try {
		final InputStream stream = new FileInputStream(confFile);
		try (final InputStream stream = new FileInputStream(confFile)) {
		return ConfigurationProcessor.processInputPortAssociations(stream);
		} catch (FileNotFoundException e) {
		// Most of the time, file will not exist, which is expected.
		@@ -2173,10 +2171,10 @@ public class InputManagerService extends IInputManager.Stub
		@Override
		public void visitKeyboardLayout(Resources resources,
		int keyboardLayoutResId, KeyboardLayout layout) {
		try {
		try (final InputStreamReader stream = new InputStreamReader(
		resources.openRawResource(keyboardLayoutResId))) {
		result[0] = layout.getDescriptor();
		result[1] = Streams.readFully(new InputStreamReader(
		resources.openRawResource(keyboardLayoutResId)));
		result[1] = Streams.readFully(stream);
		} catch (IOException ex) {
		} catch (NotFoundException ex) {
		}