From: Neil Fuller <nfuller@google.com>
Date: Wed, 10 Oct 2018 13:49:24 +0000 (+0100)
Subject: Remove dependency on internal libcore method
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=72b61e63090057581bc51210414b0a6427f37c0f;p=android-x86%2Fframeworks-base.git

Remove dependency on internal libcore method

The test already uses FileUtils.deleteContents() in several
places so the one usage of IoUtils.deleteContents() which is
functionally equivalent can be switched over to that instead.

Bug: 113148576
Test: build only
Change-Id: Ic5569c82701e89ae9178c1438caf1e8885861a76
---

diff --git a/core/tests/coretests/src/android/os/FileUtilsTest.java b/core/tests/coretests/src/android/os/FileUtilsTest.java
index 0bc3a2d879ab..17e34beb5215 100644
--- a/core/tests/coretests/src/android/os/FileUtilsTest.java
+++ b/core/tests/coretests/src/android/os/FileUtilsTest.java
@@ -32,7 +32,6 @@ import android.provider.DocumentsContract.Document;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 
-import libcore.io.IoUtils;
 import libcore.io.Streams;
 
 import com.google.android.collect.Sets;
@@ -79,7 +78,7 @@ public class FileUtilsTest {
 
     @After
     public void tearDown() throws Exception {
-        IoUtils.deleteContents(mDir);
+        FileUtils.deleteContents(mDir);
         FileUtils.deleteContents(mTarget);
     }