Merge "DATA is deprecated, but some apps really want it." (4d4c558f) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -6937,9 +6937,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		// If feature is disabled, we don't need to install
		if (!DEPRECATE_DATA_COLUMNS) return;

		// If app is modern enough, we don't need to install
		if (VMRuntime.getRuntime().getTargetSdkVersion() >= Build.VERSION_CODES.Q) return;

		// Install interception and make sure it sticks!
		Os def = null;
		do {

core/java/android/provider/MediaStore.java

+6 −18

Original line number	Diff line number	Diff line
		@@ -885,9 +885,7 @@ public final class MediaStore {
		* access this path. Instead of trying to open this path
		* directly, apps should use
		* {@link ContentResolver#openFileDescriptor(Uri, String)}
		* to gain access. This value will always be {@code NULL}
		* for apps targeting
		* {@link android.os.Build.VERSION_CODES#Q} or higher.
		* to gain access.
		*/
		@Deprecated
		@Column(Cursor.FIELD_TYPE_STRING)
		@@ -1958,9 +1956,7 @@ public final class MediaStore {
		* access this path. Instead of trying to open this path
		* directly, apps should use
		* {@link ContentResolver#loadThumbnail}
		* to gain access. This value will always be
		* {@code NULL} for apps targeting
		* {@link android.os.Build.VERSION_CODES#Q} or higher.
		* to gain access.
		*/
		@Deprecated
		@Column(Cursor.FIELD_TYPE_STRING)
		@@ -2441,9 +2437,7 @@ public final class MediaStore {
		* access this path. Instead of trying to open this path
		* directly, apps should use
		* {@link ContentResolver#openFileDescriptor(Uri, String)}
		* to gain access. This value will always be
		* {@code NULL} for apps targeting
		* {@link android.os.Build.VERSION_CODES#Q} or higher.
		* to gain access.
		*/
		@Deprecated
		@Column(Cursor.FIELD_TYPE_STRING)
		@@ -2733,9 +2727,7 @@ public final class MediaStore {
		* access this path. Instead of trying to open this path
		* directly, apps should use
		* {@link ContentResolver#loadThumbnail}
		* to gain access. This value will always be
		* {@code NULL} for apps targeting
		* {@link android.os.Build.VERSION_CODES#Q} or higher.
		* to gain access.
		*/
		@Deprecated
		@Column(Cursor.FIELD_TYPE_STRING)
		@@ -2822,9 +2814,7 @@ public final class MediaStore {
		* access this path. Instead of trying to open this path
		* directly, apps should use
		* {@link ContentResolver#loadThumbnail}
		* to gain access. This value will always be
		* {@code NULL} for apps targeting
		* {@link android.os.Build.VERSION_CODES#Q} or higher.
		* to gain access.
		*/
		@Deprecated
		@Column(Cursor.FIELD_TYPE_STRING)
		@@ -3192,9 +3182,7 @@ public final class MediaStore {
		* access this path. Instead of trying to open this path
		* directly, apps should use
		* {@link ContentResolver#openFileDescriptor(Uri, String)}
		* to gain access. This value will always be
		* {@code NULL} for apps targeting
		* {@link android.os.Build.VERSION_CODES#Q} or higher.
		* to gain access.
		*/
		@Deprecated
		@Column(Cursor.FIELD_TYPE_STRING)