am 509a243c: Merge "Check the return value of listFiles on the ifw directory" (da379447) · Commits · e / os / android_frameworks_base

services/java/com/android/server/firewall/IntentFirewall.java

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -268,6 +268,7 @@ public class IntentFirewall {
	}		}

	File[] files = rulesDir.listFiles();		File[] files = rulesDir.listFiles();
			if (files != null) {
	for (int i=0; i<files.length; i++) {		for (int i=0; i<files.length; i++) {
	File file = files[i];		File file = files[i];

	@@ -275,6 +276,7 @@ public class IntentFirewall {
	readRules(file, resolvers);		readRules(file, resolvers);
	}		}
	}		}
			}

	Slog.i(TAG, "Read new rules (A:" + resolvers[TYPE_ACTIVITY].filterSet().size() +		Slog.i(TAG, "Read new rules (A:" + resolvers[TYPE_ACTIVITY].filterSet().size() +
	" B:" + resolvers[TYPE_BROADCAST].filterSet().size() +		" B:" + resolvers[TYPE_BROADCAST].filterSet().size() +