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

Commit ac0bbdbf authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by android-build-merger
Browse files

Merge "Unhide DocumentsContract.EXTRA_ORIENTATION." into nyc-dev am: 88f86754 

am: 1372e9bd

* commit '1372e9bd':
  Unhide DocumentsContract.EXTRA_ORIENTATION.

Change-Id: I244dfefa63a02f7710dbd4ec51866e8fd56a687e
parents 3720f795 1372e9bd

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -31937,6 +31937,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";

    field public static final java.lang.String EXTRA_INFO = "info";

    field public static final java.lang.String EXTRA_LOADING = "loading";

    field public static final java.lang.String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION";

    field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT";

    field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";

  }

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -34309,6 +34309,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";

    field public static final java.lang.String EXTRA_INFO = "info";

    field public static final java.lang.String EXTRA_LOADING = "loading";

    field public static final java.lang.String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION";

    field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT";

    field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";

  }

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32006,6 +32006,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";

    field public static final java.lang.String EXTRA_INFO = "info";

    field public static final java.lang.String EXTRA_LOADING = "loading";

    field public static final java.lang.String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION";

    field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT";

    field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";

  }

core/java/android/provider/DocumentsContract.java

+1 −2
Original line number Diff line number Diff line
@@ -112,9 +112,8 @@ public final class DocumentsContract { 
     * thumbnail should be rotated.

     *

     * @see MediaStore.Images.ImageColumns#ORIENTATION

     * @hide

     */

    public static final String EXTRA_ORIENTATION = "android.content.extra.ORIENTATION";

    public static final String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION";



    /**

     * Overrides the default prompt text in DocumentsUI when set in an intent.