summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2018-11-08 12:56:18 +0000
committer Anton Hansson <hansson@google.com> 2018-11-08 13:08:42 +0000
commit09e47be13b40f6acd132ce57978f21abbaa766df (patch)
tree5bef7d703887e21b5c0939d8c39407318b8923a7
parentc5cee1e4c0bc583fc20710f950aac1947d8e6316 (diff)
Make Environment.getProductDirectory() @TestApi
Tests should be allowed to know where the product directory is mounted. Bug: 119049497 Test: atest SysConfigTest Change-Id: I3f196a862ad10d21646d4d5f8e46f6eec0a3bf6c
-rw-r--r--api/test-current.txt1
-rw-r--r--core/java/android/os/Environment.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt
index 604eebd4ffb1..ca2ab4fc7c07 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -707,6 +707,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 0c4a0b3e7cad..55951ca09266 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;
}