diff --git a/test-runner/src/android/test/RenamingDelegatingContext.java b/test-runner/src/android/test/RenamingDelegatingContext.java index 2301a785e96ca..fd33321546116 100644 --- a/test-runner/src/android/test/RenamingDelegatingContext.java +++ b/test-runner/src/android/test/RenamingDelegatingContext.java @@ -21,13 +21,18 @@ import android.content.ContextWrapper; import android.content.ContentProvider; import android.database.DatabaseErrorHandler; import android.database.sqlite.SQLiteDatabase; -import android.os.FileUtils; import android.util.Log; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.attribute.PosixFilePermission; +import java.nio.file.attribute.PosixFilePermissions; +import java.util.EnumSet; import java.util.HashSet; import java.util.Set; @@ -236,10 +241,14 @@ public class RenamingDelegatingContext extends ContextWrapper { Log.w("RenamingDelegatingContext", "Unable to create cache directory"); return null; } - FileUtils.setPermissions( - mCacheDir.getPath(), - FileUtils.S_IRWXU|FileUtils.S_IRWXG|FileUtils.S_IXOTH, - -1, -1); + try { + // Give the directory all possible permissions. + Files.setPosixFilePermissions(mCacheDir.toPath(), + EnumSet.allOf(PosixFilePermission.class)); + } catch (IOException e) { + Log.e("RenamingDelegatingContext", + "Could not set permissions of test cacheDir", e); + } } } return mCacheDir;