Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c19a039f authored by Harshit Mahajan's avatar Harshit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Expanding getDataSystemDeDirectory to be more consistent." into main

parents cfe2434e 6ee4fb70

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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();

core/java/android/os/Environment.java

+8 −0
Original line number Diff line number Diff line
@@ -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");

    }