diff options
| author | 2024-10-30 19:10:12 +0000 | |
|---|---|---|
| committer | 2024-10-30 19:10:12 +0000 | |
| commit | c19a039f7bc2b46cee7d5706eb68fdc98fe15279 (patch) | |
| tree | 336c2a70c1c8c43ebab35084b5ca7d83d6ec7eee | |
| parent | cfe2434ea5c7d9020c7083f346448ef45d2f7f97 (diff) | |
| parent | 6ee4fb703d41eef89bbaf5f87a5a976e5d97a335 (diff) | |
Merge "Expanding getDataSystemDeDirectory to be more consistent." into main
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/Environment.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 261c2ae30780..c6ece01b9b66 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -11006,7 +11006,7 @@ package android.os { public class Environment { method @NonNull public static java.io.File getDataCePackageDirectoryForUser(@NonNull java.util.UUID, @NonNull android.os.UserHandle, @NonNull String); method @NonNull public static java.io.File getDataDePackageDirectoryForUser(@NonNull java.util.UUID, @NonNull android.os.UserHandle, @NonNull String); - method @FlaggedApi("android.crashrecovery.flags.enable_crashrecovery") @NonNull public static java.io.File getDataSystemDeDirectory(); + method @FlaggedApi("android.crashrecovery.flags.enable_crashrecovery") @NonNull public static java.io.File getDataSystemDeviceProtectedDirectory(); method @NonNull public static java.util.Collection<java.io.File> getInternalMediaDirectories(); method @NonNull public static java.io.File getOdmDirectory(); method @NonNull public static java.io.File getOemDirectory(); diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 89a5e5d6637d..69540c42a742 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -417,6 +417,14 @@ public class Environment { */ @SystemApi @FlaggedApi(android.crashrecovery.flags.Flags.FLAG_ENABLE_CRASHRECOVERY) + public static @NonNull File getDataSystemDeviceProtectedDirectory() { + return buildPath(getDataDirectory(), "system_de"); + } + + /** Use {@link #getDataSystemDeviceProtectedDirectory()} instead. + * {@hide} + */ + @Deprecated public static @NonNull File getDataSystemDeDirectory() { return buildPath(getDataDirectory(), "system_de"); } |