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

am 509a243c: Merge "Check the return value of listFiles on the ifw directory"

Browse Source 
* commit '509a243c2c5ebc9cc55324bd9a03a5b560d81cfb':
  Check the return value of listFiles on the ifw directory
This commit is contained in:
Ben Gruver
2014-02-14 13:57:24 -08:00
committed by Android Git Automerger
parent b25a6936a1 509a243c2c
commit da37944785
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -268,11 +268,13 @@ public class IntentFirewall {
}
File[] files = rulesDir.listFiles();
for (int i=0; i<files.length; i++) {
File file = files[i];
if (files != null) {
for (int i=0; i<files.length; i++) {
File file = files[i];
if (file.getName().endsWith(".xml")) {
readRules(file, resolvers);
if (file.getName().endsWith(".xml")) {
readRules(file, resolvers);
}
}
}