Merge "Mark more directory getter APIs @TestApi" into rvc-dev am: 5ac047d365 am: 63c1271fbc (04ddd875) · Commits · e / os / android_frameworks_base

api/test-current.txt

+4 −0

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

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}