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 am: 5ac047d365 am: 63c1271fbc

Browse Source 
Change-Id: Iaded00496c3ec266e98b730a969f172c5fc29a4d
This commit is contained in:
TreeHugger Robot
2020-04-17 15:41:47 +00:00
committed by Automerger Merge Worker
parent ab0de2ac1c 63c1271fbc
commit 04ddd8759a
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 {
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 getSystemExtDirectory();
method @NonNull public static java.io.File getVendorDirectory();
}
public final class FileUtils {

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

@@ -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;
}