Avoid Segment fault on null pointer for USBObserver (2d672873) · Commits · e / os / android_frameworks_base

services/java/com/android/server/UsbObserver.java

+14 −10

Original line number	Diff line number	Diff line
		@@ -144,6 +144,7 @@ class UsbObserver extends UEventObserver {

		try {
		File[] files = new File(USB_COMPOSITE_CLASS_PATH).listFiles();
		if (files != null) {
		for (int i = 0; i < files.length; i++) {
		File file = new File(files[i], "enable");
		FileReader reader = new FileReader(file);
		@@ -156,6 +157,9 @@ class UsbObserver extends UEventObserver {
		mDisabledFunctions.add(functionName);
		}
		}
		} else {
		Slog.w(TAG, "This kernel has not enabled USB composite class support");
		}
		} catch (FileNotFoundException e) {
		Slog.w(TAG, "This kernel does not have USB composite class support");
		} catch (Exception e) {