fixing app directory access

Change-Id: I480874825319e35d340fc719f8c729bc1a33ed97
Signed-off-by: Pranav Vashi <[email protected]>

Author: rmp22

core/java/android/app/ContextImpl.java

@@ -3757,6 +3757,11 @@ private File[] ensureExternalDirsExistOrFilter(File[] dirs, boolean tryCreateInP
         final File[] result = new File[dirs.length];
         for (int i = 0; i < dirs.length; i++) {
             File dir = dirs[i];
+            if (dir == null) {
+                // If input was null, we can't do anything
+                result[i] = null;
+                continue;
+            }
             if (!dir.exists()) {
                 try {
                     if (!tryCreateInProcess || !dir.mkdirs()) {
@@ -3769,10 +3774,11 @@ private File[] ensureExternalDirsExistOrFilter(File[] dirs, boolean tryCreateInP
                     }
                 } catch (Exception e) {
                     Log.w(TAG, "Failed to ensure " + dir, e);
-                    dir = null;
+                    // Do not null out the dir, so we can still return the path
+                    // effectively preventing the NPE downstream
                 }
             }
-            if (dir != null && !dir.canWrite()) {
+            if (!dir.canWrite()) {
                 // Older versions of the MediaProvider mainline module had a rare early boot race
                 // condition where app-private dirs could be created with the wrong permissions;
                 // fix this up here. This check should be very fast, because dir.exists() above