summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-04-17 15:40:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-17 15:40:28 +0000
commit34ea510c8d29534fcbb186e254e5c35dad5e299a (patch)
tree448a3b817a224175721e65dab2c34eff59127e53 /core/java/android
parentdaefe7d4b7d7635ccb98341074a6a19df2c3191e (diff)
parent5ac047d3656dddfa7e842b609a6d7e27d352eae0 (diff)
Merge "Mark more directory getter APIs @TestApi" into rvc-dev am: 5ac047d365
Change-Id: I673ffc5f097b6ca5083a8ac8ac4360b39c748151
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/Environment.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index 5f8c4f5cdf27..c7355dd695f0 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -235,6 +235,7 @@ public class Environment {
* @hide
*/
@SystemApi
+ @TestApi
public static @NonNull File getOemDirectory() {
return DIR_OEM_ROOT;
}
@@ -246,6 +247,7 @@ public class Environment {
* @hide
*/
@SystemApi
+ @TestApi
public static @NonNull File getOdmDirectory() {
return DIR_ODM_ROOT;
}
@@ -256,6 +258,7 @@ public class Environment {
* @hide
*/
@SystemApi
+ @TestApi
public static @NonNull File getVendorDirectory() {
return DIR_VENDOR_ROOT;
}
@@ -294,6 +297,7 @@ public class Environment {
* @hide
*/
@SystemApi
+ @TestApi
public static @NonNull File getSystemExtDirectory() {
return DIR_SYSTEM_EXT_ROOT;
}