Unverified Commit 7510f316 authored Mar 10, 2024 by Michael Bestas

Merge tag 'android-14.0.0_r29' into staging/lineage-21.0_merge-android-14.0.0_r29

Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZW4wAKCRDorT+BmrEO
# eNOPAJ9upXOvPnhNvsP9G5QF/IXaybMnlQCfUKbKtcdJ1TZYXpI4PRsK1udOdXo=
# =pjtv
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:18:59 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2345 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Bill Yi (708) and others
# Via Automerger Merge Worker (76793) and others
* tag 'android-14.0.0_r29': (8714 commits)
  Revert "Deprecate setRemoteAdapter that takes service intent"
  Revert "Deprecate notifyAppWidgetViewDataChanged"
  Flag getSdkSandboxApplicationInfoForInstrumentation
  Revert "Flag getSdkSandboxApplicationInfoForInstrumentation"
  Flag getSdkSandboxApplicationInfoForInstrumentation
  Revert "Pass the correct user ID to SetProcessProfilesCached()"
  Ignoring user touch feedback settings for keyguard udfps authentication.
  Revert "Pass the correct user ID to SetProcessProfilesCached()"
  Pass the correct user ID to SetProcessProfilesCached()
  Pass the correct user ID to SetProcessProfilesCached()
  Pass the correct user ID to SetProcessProfilesCached()
  Pass the correct user ID to SetProcessProfilesCached()
  Work around the flicker on enter PiP for foldables
  Always sync user restriction state to UserManager
  Disallow system apps to be installed/updated as instant.
  Add default shortcut for tracing Skia's GPU memory usage
  Fix the grid artifacts in simplex noise
  Add old lockAnimationClock(long) back
  Make ControlsActivity translucent
  Default divider interaction to true if transition doesn't succeed
  ...

 Conflicts:
	cmds/idmap2/idmap2d/Idmap2Service.cpp
	cmds/idmap2/idmap2d/Idmap2Service.h
	core/java/android/app/IActivityManager.aidl
	core/java/android/app/LoadedApk.java
	core/java/android/app/admin/DevicePolicyManager.java
	core/java/android/hardware/Camera.java
	core/java/android/hardware/display/DisplayManager.java
	core/java/android/os/PowerManager.java
	core/java/android/view/IWindowManager.aidl
	core/java/android/view/KeyEvent.java
	core/java/com/android/internal/os/BinderfsStatsReader.java
	core/java/com/android/internal/view/RotationPolicy.java
	core/java/com/android/internal/widget/ILockSettings.aidl
	core/java/com/android/internal/widget/LockPatternView.java
	core/java/com/android/internal/widget/LockscreenCredential.java
	core/jni/android_media_AudioSystem.cpp
	core/res/AndroidManifest.xml
	core/tests/coretests/src/com/android/internal/os/BinderfsStatsReaderTest.java
	data/keyboards/Generic.kcm
	libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
	libs/androidfw/AssetManager.cpp
	packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
	packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
	packages/SystemUI/Android.bp
	packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsControllerTest.java
	packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java
	packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
	packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
	packages/SystemUI/src/com/android/systemui/authentication/data/repository/AuthenticationRepository.kt
	packages/SystemUI/src/com/android/systemui/authentication/domain/interactor/AuthenticationInteractor.kt
	packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
	packages/SystemUI/src/com/android/systemui/biometrics/dagger/BiometricsModule.kt
	packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModel.kt
	packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
	packages/SystemUI/src/com/android/systemui/flags/Flags.kt
	packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
	packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPowerDialog.java
	packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
	packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt
	packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
	packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
	packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt
	packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
	packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java
	packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java
	packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java
	packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java
	packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java
	packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
	packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsViewModel.java
	packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSliderController.java
	packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
	packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java
	packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
	packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
	packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java
	packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
	packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java
	packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
	packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerBaseTest.java
	packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerTest.java
	packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java
	packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt
	packages/SystemUI/tests/src/com/android/systemui/navigationbar/gestural/BackPanelControllerTest.kt
	packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerTest.kt
	packages/SystemUI/tests/src/com/android/systemui/qs/external/TileLifecycleManagerTest.java
	packages/SystemUI/tests/src/com/android/systemui/screenshot/ImageExporterTest.java
	packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsActivityTest.java
	packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsViewModelTest.java
	packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java
	packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt
	packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt
	packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.java
	packages/SystemUI/tests/utils/src/com/android/systemui/authentication/data/repository/FakeAuthenticationRepository.kt
	services/core/Android.bp
	services/core/java/com/android/server/audio/AdiDeviceState.java
	services/core/java/com/android/server/audio/AudioDeviceInventory.java
	services/core/java/com/android/server/audio/AudioService.java
	services/core/java/com/android/server/backup/SystemBackupAgent.java
	services/core/java/com/android/server/display/DisplayPowerController2.java
	services/core/java/com/android/server/input/InputSettingsObserver.java
	services/core/java/com/android/server/net/NetworkPolicyManagerService.java
	services/core/java/com/android/server/notification/NotificationManagerService.java
	services/core/java/com/android/server/notification/PreferencesHelper.java
	services/core/java/com/android/server/pm/PackageManagerService.java
	services/core/java/com/android/server/policy/PhoneWindowManager.java
	services/core/java/com/android/server/power/PowerManagerService.java
	services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
	services/core/java/com/android/server/wm/ActivityRecord.java
	services/core/java/com/android/server/wm/ActivityRecordInputSink.java
	services/core/java/com/android/server/wm/ActivityTaskManagerService.java
	services/core/java/com/android/server/wm/RemoteDisplayChangeController.java
	services/core/java/com/android/server/wm/RootWindowContainer.java
	services/core/jni/com_android_server_power_PowerManagerService.cpp
	services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java
	services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordLoggerTest.java

Change-Id: I0d8c5ad10045f820ef5435bd7abfb1a63a6cf1d7

parents 1aa3f624 f45c3bc5

.clang-format

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ BasedOnStyle: Google

		AccessModifierOffset: -4
		AlignOperands: false
		AllowShortFunctionsOnASingleLine: Inline
		AllowShortFunctionsOnASingleLine: Empty
		AlwaysBreakBeforeMultilineStrings: false
		ColumnLimit: 100
		CommentPragmas: NOLINT:.*

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,3 +5,4 @@
		gen/
		.vscode/
		*.code-workspace
		.gradle/

ADPF_OWNERS

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		lpy@google.com
		mattbuckley@google.com
		xwxw@google.com

AconfigFlags.bp

0 → 100644

+897 −0

File added.

Preview size limit exceeded, changes collapsed.

Android.bp

+117 −158

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ filegroup {
		srcs: [
		// Java/AIDL sources under frameworks/base
		":framework-annotations",
		":ravenwood-annotations",
		":framework-blobstore-sources",
		":framework-core-sources",
		":framework-drm-sources",
		@@ -71,7 +72,6 @@ filegroup {
		":framework-jobscheduler-sources", // jobscheduler is not a module for R
		":framework-keystore-sources",
		":framework-identity-sources",
		":framework-location-sources",
		":framework-mca-effect-sources",
		":framework-mca-filterfw-sources",
		":framework-mca-filterpacks-sources",
		@@ -95,14 +95,18 @@ filegroup {
		":platform-compat-native-aidl",

		// AIDL sources from external directories
		":android.hardware.biometrics.common-V3-java-source",
		":android.hardware.biometrics.common-V4-java-source",
		":android.hardware.biometrics.fingerprint-V3-java-source",
		":android.hardware.gnss-V2-java-source",
		":android.hardware.graphics.common-V3-java-source",
		":android.hardware.keymaster-V4-java-source",
		":android.hardware.radio-V3-java-source",
		":android.hardware.radio.data-V3-java-source",
		":android.hardware.radio.network-V3-java-source",
		":android.hardware.radio.voice-V3-java-source",
		":android.hardware.security.keymint-V3-java-source",
		":android.hardware.security.secureclock-V1-java-source",
		":android.hardware.thermal-V1-java-source",
		":android.hardware.thermal-V2-java-source",
		":android.hardware.tv.tuner-V2-java-source",
		":android.security.apc-java-source",
		":android.security.authorization-java-source",
		@@ -138,6 +142,9 @@ filegroup {
		// For the generated R.java and Manifest.java
		":framework-res{.aapt.srcjar}",

		// Java/AIDL sources to be moved out to CrashRecovery module
		":framework-crashrecovery-sources",

		// etc.
		":framework-javastream-protos",
		":statslog-framework-java-gen", // FrameworkStatsLog.java
		@@ -161,6 +168,12 @@ java_library {
		//same purpose.
		"//external/robolectric:__subpackages__",
		"//frameworks/layoutlib:__subpackages__",

		// This is for the same purpose as robolectric -- to build "framework.jar" for host-side
		// testing.
		// TODO: Once Ravenwood is stable, move the host side jar targets to this directory,
		// and remove this line.
		"//frameworks/base/tools/hoststubgen:__subpackages__",
		],
		}

		@@ -175,7 +188,6 @@ java_defaults {
		"graphics/java",
		"identity/java",
		"keystore/java",
		"location/java",
		"media/java",
		"media/mca/effect/java",
		"media/mca/filterfw/java",
		@@ -210,24 +222,18 @@ java_library {
		"android.hardware.contexthub-V1.0-java",
		"android.hardware.contexthub-V1.1-java",
		"android.hardware.contexthub-V1.2-java",
		"android.hardware.contexthub-V2-java",
		"android.hardware.contexthub-V3-java",
		"android.hardware.gnss-V1.0-java",
		"android.hardware.gnss-V2.1-java",
		"android.hardware.health-V1.0-java-constants",
		"android.hardware.radio-V1.0-java",
		"android.hardware.radio-V1.1-java",
		"android.hardware.radio-V1.2-java",
		"android.hardware.radio-V1.3-java",
		"android.hardware.radio-V1.4-java",
		"android.hardware.radio-V1.5-java",
		"android.hardware.radio-V1.6-java",
		"android.hardware.radio.data-V2-java",
		"android.hardware.radio.ims-V1-java",
		"android.hardware.radio.messaging-V2-java",
		"android.hardware.radio.modem-V2-java",
		"android.hardware.radio.network-V2-java",
		"android.hardware.radio.sim-V2-java",
		"android.hardware.radio.voice-V2-java",
		"android.hardware.radio.data-V3-java",
		"android.hardware.radio.ims-V2-java",
		"android.hardware.radio.messaging-V3-java",
		"android.hardware.radio.modem-V3-java",
		"android.hardware.radio.network-V3-java",
		"android.hardware.radio.sim-V3-java",
		"android.hardware.radio.voice-V3-java",
		"android.hardware.thermal-V1.0-java-constants",
		"android.hardware.thermal-V1.0-java",
		"android.hardware.thermal-V1.1-java",
		@@ -248,8 +254,8 @@ java_library {
		"android.se.omapi-V1-java",
		"android.system.suspend.control.internal-java",
		"devicepolicyprotosnano",
		"ImmutabilityAnnotation",

		"com.android.sysprop.apex",
		"com.android.sysprop.init",
		"com.android.sysprop.localization",
		"PlatformProperties",
		@@ -272,6 +278,7 @@ java_defaults {
		defaults: [
		"framework-aidl-export-defaults",
		"latest_android_hardware_soundtrigger3_java_static",
		"framework-minus-apex-aconfig-libraries",
		],
		srcs: [
		":framework-non-updatable-sources",
		@@ -284,6 +291,7 @@ java_defaults {
		enforce_permissions_exceptions: [
		// Do not add entries to this list.
		":framework-annotations",
		":ravenwood-annotations",
		":framework-blobstore-sources",
		":framework-core-sources",
		":framework-drm-sources",
		@@ -291,7 +299,6 @@ java_defaults {
		":framework-jobscheduler-sources",
		":framework-keystore-sources",
		":framework-identity-sources",
		":framework-location-sources",
		":framework-mca-effect-sources",
		":framework-mca-filterfw-sources",
		":framework-mca-filterpacks-sources",
		@@ -323,7 +330,6 @@ java_defaults {
		":installd_aidl",
		":libaudioclient_aidl",
		":libbinder_aidl",
		":libbluetooth-binder-aidl",
		":libcamera_client_aidl",
		":libcamera_client_framework_aidl",
		":libupdate_engine_aidl",
		@@ -372,17 +378,13 @@ java_defaults {
		// TODO(b/120066492): remove default_television.xml when the build system
		// propagates "required" properly.
		"default_television.xml",
		"framework-platform-compat-config",
		// TODO(b/120066492): remove gps_debug and protolog.conf.json when the build
		// system propagates "required" properly.
		"gps_debug.conf",
		"icu4j-platform-compat-config",
		"protolog.conf.json.gz",
		"services-platform-compat-config",
		"TeleService-platform-compat-config",
		"documents-ui-compat-config",
		"calendar-provider-compat-config",
		"contacts-provider-platform-compat-config",
		"framework-res",
		// any install dependencies should go into framework-minus-apex-install-dependencies
		// rather than here to avoid bloating incremental build time
		],
		libs: [
		"androidx.annotation_annotation",
		@@ -395,6 +397,7 @@ java_defaults {
		static_libs: [
		"android.hardware.common.fmq-V1-java",
		"bouncycastle-repackaged-unbundled",
		"com.android.sysprop.foldlockbehavior",
		"framework-internal-utils",
		// If MimeMap ever becomes its own APEX, then this dependency would need to be removed
		// in favor of an API stubs dependency in java_library "framework" below.
		@@ -404,6 +407,7 @@ java_defaults {
		"soundtrigger_middleware-aidl-java",
		"modules-utils-binary-xml",
		"modules-utils-build",
		"modules-utils-fastxmlserializer",
		"modules-utils-preconditions",
		"modules-utils-statemachine",
		"modules-utils-synchronous-result-receiver",
		@@ -418,21 +422,30 @@ java_defaults {
		],
		}

		// Collection of non updatable unbundled jars. The list here should match
		// \|non_updatable_modules\| variable in frameworks/base/api/api.go.
		java_library {
		name: "framework-minus-apex",
		name: "framework-non-updatable-unbundled-impl-libs",
		static_libs: [
		"framework-location.impl",
		"framework-nfc.impl",
		],
		sdk_version: "core_platform",
		installable: false,
		}

		// Separated so framework-minus-apex-defaults can be used without the libs dependency
		java_defaults {
		name: "framework-minus-apex-with-libs-defaults",
		defaults: ["framework-minus-apex-defaults"],
		installable: true,
		// For backwards compatibility.
		stem: "framework",
		apex_available: ["//apex_available:platform"],
		visibility: [
		"//frameworks/base",
		// TODO(b/147128803) remove the below lines
		"//frameworks/base/apex/blobstore/framework",
		"//frameworks/base/apex/jobscheduler/framework",
		"//frameworks/base/packages/Tethering/tests/unit",
		"//packages/modules/Connectivity/Tethering/tests/unit",
		libs: [
		"framework-virtualization.stubs.module_lib",
		"framework-non-updatable-unbundled-impl-libs",
		],
		}

		java_defaults {
		name: "framework-non-updatable-lint-defaults",
		lint: {
		extra_check_modules: ["AndroidFrameworkLintChecker"],
		disabled_checks: ["ApiMightLeakAppVisibility"],
		@@ -446,6 +459,43 @@ java_library {
		"UseOfCallerAwareMethodsWithClearedIdentity",
		],
		},
		}

		// we are unfortunately building the turbine jar twice, but more efficient and less complex
		// than generating a similar set of stubs with metalava
		java_library {
		name: "framework-minus-apex-headers",
		defaults: ["framework-minus-apex-defaults"],
		installable: false,
		// For backwards compatibility.
		stem: "framework",
		apex_available: ["//apex_available:platform"],
		visibility: [
		"//frameworks/base:__subpackages__",
		],
		compile_dex: false,
		headers_only: true,
		}

		java_library {
		name: "framework-minus-apex",
		defaults: [
		"framework-minus-apex-with-libs-defaults",
		"framework-non-updatable-lint-defaults",
		],
		installable: true,
		// For backwards compatibility.
		stem: "framework",
		apex_available: ["//apex_available:platform"],
		visibility: [
		"//frameworks/base",
		"//frameworks/base/location",
		// TODO(b/147128803) remove the below lines
		"//frameworks/base/apex/blobstore/framework",
		"//frameworks/base/apex/jobscheduler/framework",
		"//frameworks/base/packages/Tethering/tests/unit",
		"//packages/modules/Connectivity/Tethering/tests/unit",
		],
		errorprone: {
		javacflags: [
		"-Xep:AndroidFrameworkCompatChange:ERROR",
		@@ -456,7 +506,7 @@ java_library {

		java_library {
		name: "framework-minus-apex-intdefs",
		defaults: ["framework-minus-apex-defaults"],
		defaults: ["framework-minus-apex-with-libs-defaults"],
		plugins: ["intdef-annotation-processor"],

		// Errorprone and android lint will already run on framework-minus-apex, don't rerun them on
		@@ -485,12 +535,28 @@ java_library {
		static_libs: [
		"app-compat-annotations",
		"framework-minus-apex",
		"framework-non-updatable-unbundled-impl-libs",
		"framework-updatable-stubs-module_libs_api",
		],
		sdk_version: "core_platform",
		apex_available: ["//apex_available:platform"],
		}

		java_library {
		name: "framework-minus-apex-install-dependencies",
		required: [
		"framework-minus-apex",
		"framework-platform-compat-config",
		"framework-location-compat-config",
		"services-platform-compat-config",
		"icu4j-platform-compat-config",
		"TeleService-platform-compat-config",
		"documents-ui-compat-config",
		"calendar-provider-compat-config",
		"contacts-provider-platform-compat-config",
		],
		}

		platform_compat_config {
		name: "framework-platform-compat-config",
		src: ":framework-minus-apex",
		@@ -507,6 +573,13 @@ filegroup {
		],
		}

		filegroup {
		name: "framework-android-os-unit-testable-src",
		srcs: [
		"core/java/android/os/DdmSyncState.java",
		],
		}

		filegroup {
		name: "framework-networkstack-shared-srcs",
		srcs: [
		@@ -563,47 +636,11 @@ java_library {
		],
		}

		// TODO(b/145644363): move this to under StubLibraries.bp or ApiDocs.bp
		metalava_framework_docs_args = "" +
		"--api-lint-ignore-prefix android.icu. " +
		"--api-lint-ignore-prefix java. " +
		"--api-lint-ignore-prefix junit. " +
		"--api-lint-ignore-prefix org. " +
		"--error NoSettingsProvider " +
		"--error UnhiddenSystemApi " +
		"--force-convert-to-warning-nullability-annotations +:-android.:+android.icu.:-dalvik. " +
		"--hide BroadcastBehavior " +
		"--hide CallbackInterface " +
		"--hide DeprecationMismatch " +
		"--hide HiddenSuperclass " +
		"--hide HiddenTypeParameter " +
		"--hide MissingPermission " +
		"--hide-package android.audio.policy.configuration.V7_0 " +
		"--hide-package com.android.server " +
		"--hide RequiresPermission " +
		"--hide SdkConstant " +
		"--hide Todo " +
		"--hide Typo " +
		"--hide UnavailableSymbol " +
		"--manifest $(location :frameworks-base-core-AndroidManifest.xml) "

		packages_to_document = [
		"android",
		"dalvik",
		"java",
		"javax",
		"junit",
		"org.apache.http",
		"org.json",
		"org.w3c.dom",
		"org.xml.sax",
		"org.xmlpull",
		]

		filegroup {
		name: "android-non-updatable-stub-sources",
		srcs: [
		":framework-mime-sources", // mimemap builds separately but has no separate droidstubs.
		":framework-minus-apex-aconfig-srcjars",
		":framework-non-updatable-sources",
		":opt-telephony-srcs",
		":opt-net-voip-srcs",
		@@ -613,87 +650,9 @@ filegroup {
		visibility: ["//frameworks/base/api"],
		}

		// Defaults for all stubs that include the non-updatable framework. These defaults do not include
		// module symbols, so will not compile correctly on their own. Users must add module APIs to the
		// classpath (or sources) somehow.
		stubs_defaults {
		name: "android-non-updatable-stubs-defaults",
		srcs: [":android-non-updatable-stub-sources"],
		sdk_version: "none",
		system_modules: "none",
		java_version: "1.8",
		arg_files: [":frameworks-base-core-AndroidManifest.xml"],
		aidl: {
		include_dirs: [
		"frameworks/av/aidl",
		"frameworks/base/media/aidl",
		"frameworks/base/telephony/java",
		"frameworks/native/libs/permission/aidl",
		"packages/modules/Bluetooth/framework/aidl-export",
		"packages/modules/Connectivity/framework/aidl-export",
		"packages/modules/Media/apex/aidl/stable",
		"hardware/interfaces/biometrics/common/aidl",
		"hardware/interfaces/biometrics/fingerprint/aidl",
		"hardware/interfaces/graphics/common/aidl",
		"hardware/interfaces/keymaster/aidl",
		"system/hardware/interfaces/media/aidl",
		],
		},
		// These are libs from framework-internal-utils that are required (i.e. being referenced)
		// from framework-non-updatable-sources. Add more here when there's a need.
		// DO NOT add the entire framework-internal-utils. It might cause unnecessary circular
		// dependencies gets bigger.
		libs: [
		"android.hardware.cas-V1.2-java",
		"android.hardware.health-V1.0-java-constants",
		"android.hardware.radio-V1.5-java",
		"android.hardware.radio-V1.6-java",
		"android.hardware.thermal-V1.0-java-constants",
		"android.hardware.thermal-V2.0-java",
		"android.hardware.tv.input-V1.0-java-constants",
		"android.hardware.usb-V1.0-java-constants",
		"android.hardware.usb-V1.1-java-constants",
		"android.hardware.usb.gadget-V1.0-java",
		"android.hardware.vibrator-V1.3-java",
		"framework-protos",
		],
		filter_packages: packages_to_document,
		high_mem: true, // Lots of sources => high memory use, see b/170701554
		installable: false,
		annotations_enabled: true,
		previous_api: ":android.api.public.latest",
		merge_annotations_dirs: ["metalava-manual"],
		defaults_visibility: ["//frameworks/base/api"],
		visibility: ["//frameworks/base/api"],
		}

		// Defaults with module APIs in the classpath (mostly from prebuilts).
		// Suitable for compiling android-non-updatable.
		stubs_defaults {
		name: "module-classpath-stubs-defaults",
		aidl: {
		include_dirs: [
		"packages/modules/Bluetooth/framework/aidl-export",
		"packages/modules/Connectivity/framework/aidl-export",
		"packages/modules/Media/apex/aidl/stable",
		],
		},
		libs: [
		"art.module.public.api",
		"sdk_module-lib_current_framework-tethering",
		"sdk_module-lib_current_framework-connectivity-t",
		"sdk_public_current_framework-bluetooth",
		// There are a few classes from modules used by the core that
		// need to be resolved by metalava. We use a prebuilt stub of the
		// full sdk to ensure we can resolve them. If a new class gets added,
		// the prebuilts/sdk/current needs to be updated.
		"sdk_system_current_android",
		// NOTE: The below can be removed once the prebuilt stub contains IKE.
		"sdk_system_current_android.net.ipsec.ike",
		],
		}

		build = [
		"AconfigFlags.bp",
		"ProtoLibraries.bp",
		"TestProtoLibraries.bp",
		"Ravenwood.bp",
		]