Merge "Move MediaStore.java inside APEX boundary." (1e89d231) · Commits · e / os / android_frameworks_base

Android.bp

+20 −11

Original line number	Diff line number	Diff line
		@@ -265,6 +265,7 @@ filegroup {
		":framework-sdkext-sources",
		":framework-statsd-sources",
		":updatable-media-srcs",
		":framework-mediaprovider-sources",
		":framework-wifi-updatable-sources",
		]
		}
		@@ -380,6 +381,7 @@ java_defaults {
		"ext",
		"unsupportedappusage",
		"updatable_media_stubs",
		"framework_mediaprovider_stubs",
		],

		jarjar_rules: ":framework-jarjar-rules",
		@@ -468,6 +470,7 @@ java_library {
		static_libs: [
		"framework-minus-apex",
		"updatable_media_stubs",
		"framework_mediaprovider_stubs",
		"framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs
		"framework-sdkext-stubs-systemapi",
		// TODO(b/146167933): Use framework-statsd-stubs instead.
		@@ -583,11 +586,14 @@ gensrcs {
		filegroup {
		name: "framework-annotations",
		srcs: [
		"core/java/android/annotation/NonNull.java",
		"core/java/android/annotation/Nullable.java",
		"core/java/android/annotation/IntDef.java",
		"core/java/android/annotation/IntRange.java",
		"core/java/android/annotation/NonNull.java",
		"core/java/android/annotation/Nullable.java",
		"core/java/android/annotation/RequiresPermission.java",
		"core/java/android/annotation/SdkConstant.java",
		"core/java/android/annotation/SystemApi.java",
		"core/java/android/annotation/TestApi.java",
		"core/java/android/annotation/UnsupportedAppUsage.java",
		"core/java/com/android/internal/annotations/GuardedBy.java",
		"core/java/com/android/internal/annotations/VisibleForTesting.java",
		@@ -1648,20 +1654,23 @@ filegroup {
		filegroup {
		name: "framework-media-annotation-srcs",
		srcs: [
		":framework-annotations",
		"core/java/android/annotation/CallbackExecutor.java",
		"core/java/android/annotation/CallSuper.java",
		"core/java/android/annotation/DrawableRes.java",
		"core/java/android/annotation/IntDef.java",
		"core/java/android/annotation/LongDef.java",
		"core/java/android/annotation/NonNull.java",
		"core/java/android/annotation/Nullable.java",
		"core/java/android/annotation/RequiresPermission.java",
		"core/java/android/annotation/SdkConstant.java",
		"core/java/android/annotation/StringDef.java",
		"core/java/android/annotation/SystemApi.java",
		"core/java/android/annotation/TestApi.java",
		"core/java/android/annotation/UnsupportedAppUsage.java",
		"core/java/com/android/internal/annotations/GuardedBy.java",
		],
		}

		filegroup {
		name: "framework-mediaprovider-annotation-sources",
		srcs: [
		":framework-annotations",
		"core/java/android/annotation/BytesLong.java",
		"core/java/android/annotation/CurrentTimeMillisLong.java",
		"core/java/android/annotation/CurrentTimeSecondsLong.java",
		"core/java/android/annotation/DurationMillisLong.java",
		],
		}

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -39063,6 +39063,8 @@ package android.provider {
		field public static final String GENRE = "genre";
		field public static final String HEIGHT = "height";
		field public static final String INSTANCE_ID = "instance_id";
		field public static final String IS_DOWNLOAD = "is_download";
		field public static final String IS_DRM = "is_drm";
		field public static final String IS_FAVORITE = "is_favorite";
		field public static final String IS_PENDING = "is_pending";
		field public static final String IS_TRASHED = "is_trashed";

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -7295,8 +7295,12 @@ package android.provider {
		}

		public final class MediaStore {
		method @NonNull public static android.net.Uri rewriteToLegacy(@NonNull android.net.Uri);
		method @NonNull public static android.net.Uri scanFile(@NonNull android.content.ContentResolver, @NonNull java.io.File);
		method public static void scanVolume(@NonNull android.content.ContentResolver, @NonNull String);
		method public static void waitForIdle(@NonNull android.content.ContentResolver);
		field public static final String AUTHORITY_LEGACY = "media_legacy";
		field @NonNull public static final android.net.Uri AUTHORITY_LEGACY_URI;
		}

		public abstract class SearchIndexableData {

core/java/android/provider/Column.java

deleted100644 → 0

+0 −50

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.provider;

		import static java.lang.annotation.ElementType.FIELD;
		import static java.lang.annotation.RetentionPolicy.RUNTIME;

		import android.content.ContentProvider;
		import android.content.ContentValues;
		import android.database.Cursor;

		import java.lang.annotation.Documented;
		import java.lang.annotation.Retention;
		import java.lang.annotation.Target;

		/**
		* Denotes that a field is a {@link ContentProvider} column. It can be used as a
		* key for {@link ContentValues} when inserting or updating data, or as a
		* projection when querying.
		*
		* @hide
		*/
		@Documented
		@Retention(RUNTIME)
		@Target({FIELD})
		public @interface Column {
		/**
		* The {@link Cursor#getType(int)} of the data stored in this column.
		*/
		int value();

		/**
		* This column is read-only and cannot be defined during insert or updates.
		*/
		boolean readOnly() default false;
		}

core/java/android/provider/MediaStore.java

deleted100644 → 0

+0 −3832

File deleted.

Preview size limit exceeded, changes collapsed.