Snap for 7246408 from 395b88847f7fae468abdcef9a7f895a28394706d to sc-release (f1b4cac9) · Commits · e / os / android_frameworks_base

Android.bp

+19 −43

Original line number	Diff line number	Diff line
		@@ -510,15 +510,6 @@ java_library {
		],
		}

		filegroup {
		name: "framework-all-sources",
		srcs: [
		":framework-mime-sources",
		":framework-non-updatable-sources",
		":framework-updatable-sources",
		],
		}

		// AIDL files under these paths are mixture of public and private ones.
		// They shouldn't be exported across module boundaries.
		java_defaults {
		@@ -859,10 +850,14 @@ filegroup {
		srcs: [
		"core/java/android/annotation/AnyThread.java",
		"core/java/android/annotation/AppIdInt.java",
		"core/java/android/annotation/CallSuper.java",
		"core/java/android/annotation/BytesLong.java",
		"core/java/android/annotation/CallbackExecutor.java",
		"core/java/android/annotation/CallSuper.java",
		"core/java/android/annotation/CheckResult.java",
		"core/java/android/annotation/CurrentTimeMillisLong.java",
		"core/java/android/annotation/CurrentTimeSecondsLong.java",
		"core/java/android/annotation/DrawableRes.java",
		"core/java/android/annotation/DurationMillisLong.java",
		"core/java/android/annotation/Hide.java",
		"core/java/android/annotation/IntDef.java",
		"core/java/android/annotation/IntRange.java",
		@@ -873,15 +868,14 @@ filegroup {
		"core/java/android/annotation/RequiresPermission.java",
		"core/java/android/annotation/SdkConstant.java",
		"core/java/android/annotation/StringDef.java",
		"core/java/android/annotation/SuppressLint.java",
		"core/java/android/annotation/SystemApi.java",
		"core/java/android/annotation/SystemService.java",
		"core/java/android/annotation/TestApi.java",
		"core/java/android/annotation/UserIdInt.java",
		"core/java/android/annotation/WorkerThread.java",
		"core/java/com/android/internal/annotations/GuardedBy.java",
		"core/java/com/android/internal/annotations/VisibleForTesting.java",
		"core/java/com/android/internal/annotations/Immutable.java",
		"core/java/com/android/internal/annotations/VisibleForTesting.java",
		],
		}

		@@ -895,7 +889,6 @@ filegroup {
		name: "framework-ike-shared-srcs",
		visibility: ["//packages/modules/IPsec"],
		srcs: [
		"core/java/android/annotation/StringDef.java",
		"core/java/android/net/annotations/PolicyDirection.java",
		"core/java/com/android/internal/util/HexDump.java",
		"core/java/com/android/internal/util/IState.java",
		@@ -1369,36 +1362,6 @@ python_binary_host {
		],
		}

		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/LongDef.java",
		"core/java/android/annotation/StringDef.java",
		],
		}

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

		// Creates an index of AIDL methods; used for adding UnsupportedAppUsage
		// annotations to private apis
		aidl_mapping {
		name: "framework-aidl-mappings",
		srcs: [":framework-all-sources"],
		output: "framework-aidl-mappings.txt",
		}

		// Avoid including Parcelable classes as we don't want to have two copies of
		// Parcelable cross the libraries. This is used by telephony-common (frameworks/opt/telephony)
		// and TeleService app (packages/services/Telephony).
		@@ -1514,6 +1477,19 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x
		"--api-lint-ignore-prefix junit. " +
		"--api-lint-ignore-prefix org. "

		filegroup {
		name: "framework-non-updatable-stub-sources",
		srcs: [
		":framework-mime-sources", // mimemap builds separately but has no separate droidstubs.
		":framework-non-updatable-sources",
		":opt-telephony-srcs",
		":opt-net-voip-srcs",
		"core/java/*/.logtags",
		"**/package.html",
		],
		visibility: ["//visibility:private"],
		}

		build = [
		"StubLibraries.bp",
		"ApiDocs.bp",

ApiDocs.bp

+1 −5

Original line number	Diff line number	Diff line
		@@ -58,13 +58,9 @@ framework_docs_only_libs = [
		stubs_defaults {
		name: "framework-doc-stubs-default",
		srcs: [
		":framework-mime-sources",
		":framework-non-updatable-sources",
		":framework-non-updatable-stub-sources",
		":framework-updatable-sources",
		"core/java/*/.logtags",
		"test-base/src/*/.java",
		":opt-telephony-srcs",
		":opt-net-voip-srcs",
		":art.module.public.api{.public.stubs.source}",
		":conscrypt.module.public.api{.public.stubs.source}",
		":i18n.module.public.api{.public.stubs.source}",

StubLibraries.bp

+1 −7

Original line number	Diff line number	Diff line
		@@ -42,13 +42,7 @@ packages_to_document = [

		stubs_defaults {
		name: "metalava-non-updatable-api-stubs-default",
		srcs: [
		":framework-non-updatable-sources",
		"core/java/*/.logtags",
		":opt-telephony-srcs",
		":opt-net-voip-srcs",
		"**/package.html",
		],
		srcs: [":framework-non-updatable-stub-sources"],
		sdk_version: "none",
		system_modules: "none",
		java_version: "1.8",

apex/appsearch/framework/java/android/app/appsearch/AppSearchSession.java

+22 −2

Original line number	Diff line number	Diff line
		@@ -587,8 +587,28 @@ public final class AppSearchSession implements Closeable {
		Objects.requireNonNull(executor);
		Objects.requireNonNull(callback);
		Preconditions.checkState(!mIsClosed, "AppSearchSession has already been closed");
		// TODO(b/182909475): Implement getStorageInfo
		throw new UnsupportedOperationException();
		try {
		mService.getStorageInfo(
		mPackageName,
		mDatabaseName,
		mUserId,
		new IAppSearchResultCallback.Stub() {
		public void onResult(AppSearchResult result) {
		executor.execute(() -> {
		if (result.isSuccess()) {
		Bundle responseBundle = (Bundle) result.getResultValue();
		StorageInfo response =
		new StorageInfo(responseBundle);
		callback.accept(AppSearchResult.newSuccessfulResult(response));
		} else {
		callback.accept(result);
		}
		});
		}
		});
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**

apex/appsearch/framework/java/android/app/appsearch/IAppSearchManager.aidl

+16 −0

Original line number	Diff line number	Diff line
		@@ -306,6 +306,22 @@ interface IAppSearchManager {
		in int userId,
		in IAppSearchResultCallback callback);

		/**
		* Gets the storage info.
		*
		* @param packageName The name of the package to get the storage info for.
		* @param databaseName The databaseName to get the storage info for.
		* @param userId Id of the calling user
		* @param callback {@link IAppSearchResultCallback#onResult} will be called with an
		* {@link AppSearchResult}<{@link Bundle}>, where the value is a
		* {@link StorageInfo}.
		*/
		void getStorageInfo(
		in String packageName,
		in String databaseName,
		in int userId,
		in IAppSearchResultCallback callback);

		/**
		* Persists all update/delete requests to the disk.
		*