Merge "Make Environment.getProductDirectory() @TestApi"

2 files changed, 2 insertions, 0 deletions

diff --git a/api/test-current.txt b/api/test-current.txt
index 8b8c5426f195..f8179b893c87 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -710,6 +710,7 @@ package android.os {
 
   public class Environment {
     method public static java.io.File buildPath(java.io.File, java.lang.String...);
+    method public static java.io.File getProductDirectory();
     method public static java.io.File getStorageDirectory();
   }
 
diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index 1bae3f74a5da..0c1aae8bd16c 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -199,6 +199,7 @@ public class Environment {
      * @hide
      */
     @SystemApi
+    @TestApi
     public static File getProductDirectory() {
         return DIR_PRODUCT_ROOT;
     }