Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mark more directory getter APIs @TestApi" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-17 15:40:16 +00:00
committed by Android (Google) Code Review
parent 42183bf508 e63ae2f84f
commit 5ac047d365
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/test-current.txt
View File

@@ -2272,7 +2272,11 @@ package android.os {
public class Environment { public class Environment {
method public static java.io.File buildPath(java.io.File, java.lang.String...); method public static java.io.File buildPath(java.io.File, java.lang.String...);
method @NonNull public static java.io.File getOdmDirectory();
method @NonNull public static java.io.File getOemDirectory();
method @NonNull public static java.io.File getProductDirectory(); method @NonNull public static java.io.File getProductDirectory();
method @NonNull public static java.io.File getSystemExtDirectory();
method @NonNull public static java.io.File getVendorDirectory();
} }
public final class FileUtils { public final class FileUtils {

4
core/java/android/os/Environment.java
View File

@@ -235,6 +235,7 @@ public class Environment {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@TestApi
public static @NonNull File getOemDirectory() { public static @NonNull File getOemDirectory() {
return DIR_OEM_ROOT; return DIR_OEM_ROOT;
} }
@@ -246,6 +247,7 @@ public class Environment {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@TestApi
public static @NonNull File getOdmDirectory() { public static @NonNull File getOdmDirectory() {
return DIR_ODM_ROOT; return DIR_ODM_ROOT;
} }
@@ -256,6 +258,7 @@ public class Environment {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@TestApi
public static @NonNull File getVendorDirectory() { public static @NonNull File getVendorDirectory() {
return DIR_VENDOR_ROOT; return DIR_VENDOR_ROOT;
} }
@@ -294,6 +297,7 @@ public class Environment {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@TestApi
public static @NonNull File getSystemExtDirectory() { public static @NonNull File getSystemExtDirectory() {
return DIR_SYSTEM_EXT_ROOT; return DIR_SYSTEM_EXT_ROOT;
} }