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

Commit 6ee4fb70 authored by Harshit Mahajan's avatar Harshit Mahajan
Browse files

Expanding getDataSystemDeDirectory to be more consistent. 

As per API feedback, expanding getDataSystemDeDirectory to getDataSystemDeviceProtectedDirectory to be more consistent with existing APIs.

Bug: 373959191
Change-Id: I0afec23986d9db03dec7556057ba8a234e4f3573
Test: atest android.os.cts.EnvironmentTest
Flag: android.crashrecovery.flags.enable_crashrecovery
parent df2b4213

core/api/system-current.txt

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

    }