From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 17 Apr 2019 19:34:44 +0000 (-0600)
Subject: Remove GROUP_ID; not actively being used by apps.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5e1ca0e889ea3edcbd3e302e7a148f5d79fdea14;p=android-x86%2Fframeworks-base.git

Remove GROUP_ID; not actively being used by apps.

Bug: 130744218
Test: none
Change-Id: I2917b84ffcc698d3cbffe7dfbd49c76b21c46515
---

diff --git a/api/current.txt b/api/current.txt
index f602c9ad113d..b28be34ae270 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -38513,7 +38513,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";
diff --git a/api/removed.txt b/api/removed.txt
index 883632623a83..ab5e7e5deeaa 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -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";
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index bff8328defa0..c50d003afcc0 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -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";
 
         /**