drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check the return value of listFiles on the ifw directory"

Browse Source
This commit is contained in:
Ben Gruver
2014-02-14 21:15:49 +00:00
committed by Gerrit Code Review
parent d7043f0084 26c6b783d2
commit 509a243c2c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/firewall/IntentFirewall.java
View File

@ -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() +