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

Commit 34ea510c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Mark more directory getter APIs @TestApi" into rvc-dev am: 5ac047d3 

Change-Id: I673ffc5f097b6ca5083a8ac8ac4360b39c748151
parents daefe7d4 5ac047d3

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -2272,7 +2272,11 @@ package android.os { 


  public class Environment {

    method public static java.io.File buildPath(java.io.File, java.lang.String...);

    method @NonNull public static java.io.File getOdmDirectory();

    method @NonNull public static java.io.File getOemDirectory();

    method @NonNull public static java.io.File getProductDirectory();

    method @NonNull public static java.io.File getSystemExtDirectory();

    method @NonNull public static java.io.File getVendorDirectory();

  }



  public final class FileUtils {

core/java/android/os/Environment.java

+4 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ public class Environment { 
     * @hide

     */

    @SystemApi

    @TestApi

    public static @NonNull File getOemDirectory() {

        return DIR_OEM_ROOT;

    }
@@ -246,6 +247,7 @@ public class Environment { 
     * @hide

     */

    @SystemApi

    @TestApi

    public static @NonNull File getOdmDirectory() {

        return DIR_ODM_ROOT;

    }
@@ -256,6 +258,7 @@ public class Environment { 
     * @hide

     */

    @SystemApi

    @TestApi

    public static @NonNull File getVendorDirectory() {

        return DIR_VENDOR_ROOT;

    }
@@ -294,6 +297,7 @@ public class Environment { 
     * @hide

     */

    @SystemApi

    @TestApi

    public static @NonNull File getSystemExtDirectory() {

        return DIR_SYSTEM_EXT_ROOT;

    }