Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2231eb42 authored by Paul Duffin's avatar Paul Duffin
Browse files

Remove dependency on internal FileUtils class 

In preparation for building android.legacy.test library against
the test API this removes a dependency on internal classes.

Bug: 30188076
Test: make checkbuild cts-tradefed run cts -m CtsContentTestCases -t android.content.cts.SyncStorageEngineTest
Change-Id: I4c0e7fdd368e96459c8404ff7cea8738683d0ec1
parent 8c5a24d1

test-runner/src/android/test/RenamingDelegatingContext.java

+14 −5
Original line number Diff line number Diff line
@@ -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;