Merge "Mark more directory getter APIs @TestApi" into rvc-dev am: 5ac047d365... (8f347258) · Commits · e / os / android_frameworks_base

api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -238,6 +238,7 @@ public class Environment {
		* @hide
		*/
		@SystemApi
		@TestApi
		public static @NonNull File getOemDirectory() {
		return DIR_OEM_ROOT;
		}
		@@ -249,6 +250,7 @@ public class Environment {
		* @hide
		*/
		@SystemApi
		@TestApi
		public static @NonNull File getOdmDirectory() {
		return DIR_ODM_ROOT;
		}
		@@ -259,6 +261,7 @@ public class Environment {
		* @hide
		*/
		@SystemApi
		@TestApi
		public static @NonNull File getVendorDirectory() {
		return DIR_VENDOR_ROOT;
		}
		@@ -297,6 +300,7 @@ public class Environment {
		* @hide
		*/
		@SystemApi
		@TestApi
		public static @NonNull File getSystemExtDirectory() {
		return DIR_SYSTEM_EXT_ROOT;
		}