commit f80809ffd7b6ea8eb120ce5ccb343582c2757ea0
author Philip P. Moltmann <moltmann@google.com> Wed Apr 04 11:20:44 2018 -0700
committer Philip P. Moltmann <moltmann@google.com> Fri Apr 06 14:59:07 2018 -0700
tree 4d3f0aab41b4865f8f3a1c9fb9f0a787183da504
parent 7f03f1a20c1b6190003b9b5baf0f14dfc25785b5

Expose TestAPIs needed by GtsOsTestCases

Test: atest GtsOsTestCases on pi-dev:taimen and oc-mr1:sailfish
Bug: 77497338
Change-Id: I5de976991a857bfbed2faa943822af542601fa8b

core/java/android/os/Environment.java

diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index 03203d0..213260f 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -16,6 +16,7 @@
 
 package android.os;
 
+import android.annotation.TestApi;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.os.storage.StorageManager;
@@ -1033,6 +1034,7 @@
      *
      * @hide
      */
+    @TestApi
     public static File buildPath(File base, String... segments) {
         File cur = base;
         for (String segment : segments) {