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

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

@@ -268,6 +268,7 @@ public class IntentFirewall {
         }
 
         File[] files = rulesDir.listFiles();
+        if (files != null) {
             for (int i=0; i<files.length; i++) {
                 File file = files[i];
 
@@ -275,6 +276,7 @@ public class IntentFirewall {
                     readRules(file, resolvers);
                 }
             }
+        }
 
         Slog.i(TAG, "Read new rules (A:" + resolvers[TYPE_ACTIVITY].filterSet().size() +
                 " B:" + resolvers[TYPE_BROADCAST].filterSet().size() +