Merge "Provide paths of interest to vendors." (7da7681c) · Commits · e / os / android_frameworks_base

api/system-current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -3812,6 +3812,14 @@ package android.os {
		field public static final java.lang.String ACTION_UPDATE_SMS_SHORT_CODES = "android.intent.action.UPDATE_SMS_SHORT_CODES";
		}

		public class Environment {
		method public static java.io.File getOdmDirectory();
		method public static java.io.File getOemDirectory();
		method public static java.io.File getProductDirectory();
		method public static java.io.File getProductServicesDirectory();
		method public static java.io.File getVendorDirectory();
		}

		public class HidlSupport {
		method public static boolean deepEquals(java.lang.Object, java.lang.Object);
		method public static int deepHashCode(java.lang.Object);

config/hiddenapi-light-greylist.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -728,8 +728,6 @@ Landroid/os/Environment;->buildExternalStorageAppMediaDirs(Ljava/lang/String;)[L
		Landroid/os/Environment;->buildExternalStorageAppObbDirs(Ljava/lang/String;)[Ljava/io/File;
		Landroid/os/Environment;->getDataSystemDirectory()Ljava/io/File;
		Landroid/os/Environment;->getLegacyExternalStorageObbDirectory()Ljava/io/File;
		Landroid/os/Environment;->getOemDirectory()Ljava/io/File;
		Landroid/os/Environment;->getVendorDirectory()Ljava/io/File;
		Landroid/os/Environment;->initForCurrentUser()V
		Landroid/os/Environment;->maybeTranslateEmulatedPathToInternal(Ljava/io/File;)Ljava/io/File;
		Landroid/os/Environment;->sCurrentUser:Landroid/os/Environment$UserEnvironment;

core/java/android/os/Environment.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.os;

		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.app.admin.DevicePolicyManager;
		import android.content.Context;
		@@ -165,6 +166,7 @@ public class Environment {
		*
		* @hide
		*/
		@SystemApi
		public static File getOemDirectory() {
		return DIR_OEM_ROOT;
		}
		@@ -175,6 +177,7 @@ public class Environment {
		*
		* @hide
		*/
		@SystemApi
		public static File getOdmDirectory() {
		return DIR_ODM_ROOT;
		}
		@@ -184,6 +187,7 @@ public class Environment {
		* software that should persist across simple reflashing of the "system" partition.
		* @hide
		*/
		@SystemApi
		public static File getVendorDirectory() {
		return DIR_VENDOR_ROOT;
		}
		@@ -194,6 +198,7 @@ public class Environment {
		*
		* @hide
		*/
		@SystemApi
		public static File getProductDirectory() {
		return DIR_PRODUCT_ROOT;
		}
		@@ -204,6 +209,7 @@ public class Environment {
		*
		* @hide
		*/
		@SystemApi
		public static File getProductServicesDirectory() {
		return DIR_PRODUCT_SERVICES_ROOT;
		}
		@@ -1063,7 +1069,6 @@ public class Environment {
		return cur;
		}


		/**
		* If the given path exists on emulated external storage, return the
		* translated backing path hosted on internal storage. This bypasses any
		@@ -1074,8 +1079,10 @@ public class Environment {
		* must hold {@link android.Manifest.permission#WRITE_MEDIA_STORAGE}
		* permission.
		*
		* @deprecated disabled now that FUSE has been replaced by sdcardfs
		* @hide
		*/
		@Deprecated
		public static File maybeTranslateEmulatedPathToInternal(File path) {
		return StorageManager.maybeTranslateEmulatedPathToInternal(path);
		}

core/java/android/os/storage/StorageManager.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -1521,7 +1521,11 @@ public class StorageManager {
		return SystemProperties.getBoolean(PROP_HAS_ADOPTABLE, false);
		}

		/** {@hide} */
		/**
		* @deprecated disabled now that FUSE has been replaced by sdcardfs
		* @hide
		*/
		@Deprecated
		public static File maybeTranslateEmulatedPathToInternal(File path) {
		// Disabled now that FUSE has been replaced by sdcardfs
		return path;