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

Commit a65a63ee authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Remove GROUP_ID; not actively being used by apps." into qt-dev am: 285f6fff 

am: da1f6713

Change-Id: I1d0002a9ee24e7571ca72ff62616c46ab53f8e11
parents 340ad430 da1f6713

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -38515,7 +38515,6 @@ package android.provider { 
    field public static final String DISPLAY_NAME = "_display_name";

    field public static final String DOCUMENT_ID = "document_id";

    field public static final String DURATION = "duration";

    field public static final String GROUP_ID = "group_id";

    field public static final String HEIGHT = "height";

    field public static final String INSTANCE_ID = "instance_id";

    field public static final String IS_PENDING = "is_pending";

api/removed.txt

+1 −0
Original line number Diff line number Diff line
@@ -539,6 +539,7 @@ package android.provider { 
  }



  public static interface MediaStore.MediaColumns extends android.provider.BaseColumns {

    field @Deprecated public static final String GROUP_ID = "group_id";

    field @Deprecated public static final String HASH = "_hash";

    field @Deprecated public static final String IS_TRASHED = "is_trashed";

    field @Deprecated public static final String PRIMARY_DIRECTORY = "primary_directory";

core/java/android/provider/MediaStore.java

+3 −0
Original line number Diff line number Diff line
@@ -1150,8 +1150,11 @@ public final class MediaStore { 
         * {@code IMG1024.BURST001.JPG} and {@code IMG1024.BURST002.JPG}

         * will have the same {@link #GROUP_ID} because the first portion of

         * their filenames is identical.

         *

         * @removed

         */

        @Column(value = Cursor.FIELD_TYPE_INTEGER, readOnly = true)

        @Deprecated

        public static final String GROUP_ID = "group_id";



        /**