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

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

Merge "Fix Environment#getDataSystemDeDirectory API" into main

parents 3c0b650a 86f8f8bc

core/api/module-lib-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -384,10 +384,6 @@ 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();

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10773,6 +10773,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 @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

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ public class Environment { 
     * Returns the base directory for per-user system directory, device encrypted.

     * {@hide}

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @SystemApi

    @FlaggedApi(android.crashrecovery.flags.Flags.FLAG_ENABLE_CRASHRECOVERY)

    public static @NonNull File getDataSystemDeDirectory() {

        return buildPath(getDataDirectory(), "system_de");