Merge "Making getDataSystemDeDirectory as SystemApi" into main (e8e26150) · Commits · e / os / android_frameworks_base

core/api/module-lib-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -384,6 +384,10 @@ package android.os {
		field public static final int DEVICE_INITIAL_SDK_INT;
		}

		public class Environment {
		method @FlaggedApi("android.crashrecovery.flags.enable_crashrecovery") @NonNull public static java.io.File getDataSystemDeDirectory();
		}

		public class IpcDataCache<Query, Result> {
		ctor public IpcDataCache(int, @NonNull String, @NonNull String, @NonNull String, @NonNull android.os.IpcDataCache.QueryHandler<Query,Result>);
		method public void disableForCurrentProcess();

+4 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.os;

		import android.Manifest;
		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SuppressLint;
		@@ -412,7 +413,9 @@ public class Environment {
		* Returns the base directory for per-user system directory, device encrypted.
		* {@hide}
		*/
		public static File getDataSystemDeDirectory() {
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@FlaggedApi(android.crashrecovery.flags.Flags.FLAG_ENABLE_CRASHRECOVERY)
		public static @NonNull File getDataSystemDeDirectory() {
		return buildPath(getDataDirectory(), "system_de");
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -7,3 +7,10 @@ flag {
		bug: "310236690"
		is_fixed_read_only: true
		}

		flag {
		name: "enable_crashrecovery"
		namespace: "crashrecovery"
		description: "Enables various dependencies of crashrecovery module"
		bug: "289203818"
		}