commit 09e47be13b40f6acd132ce57978f21abbaa766df
author Anton Hansson <hansson@google.com> Thu Nov 08 12:56:18 2018 +0000
committer Anton Hansson <hansson@google.com> Thu Nov 08 13:08:42 2018 +0000
tree 5bef7d703887e21b5c0939d8c39407318b8923a7
parent c5cee1e4c0bc583fc20710f950aac1947d8e6316

Make Environment.getProductDirectory() @TestApi

Tests should be allowed to know where the product directory is mounted.

Bug: 119049497
Test: atest SysConfigTest
Change-Id: I3f196a862ad10d21646d4d5f8e46f6eec0a3bf6c

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 604eebd..ca2ab4f 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -707,6 +707,7 @@
 
   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();
   }
 

core/java/android/os/Environment.java

diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index 0c4a0b3e..55951ca 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -199,6 +199,7 @@
      * @hide
      */
     @SystemApi
+    @TestApi
     public static File getProductDirectory() {
         return DIR_PRODUCT_ROOT;
     }