Andrei Onea
7e609d4ec7
Add service-media-s to merged stubs
...
service-media-s does not currently export any system server apis,
however its sources are used to generate the 'old style' system server
stubs.
Test: m checkapi
Bug: 177640454
Change-Id: I075915212af44a207ad70b0761403cacc0a80241
2021-03-15 12:32:58 +00:00
Andrei Onea
dcb5446b2b
Add genrules for merged system server stubs
...
Re-land https://r.android.com/1596559 .
Bug: 177640454
Test: diff frameworks/base/services/api/current.txt \
out/soong/.intermediates/frameworks/base/api/services-system-server-current.txt/gen/system-server-current.txt
Merged-In: I021f59bb91572d28798a97ab8aa687b684599d6c
Change-Id: I5d5045f8d8f6b0ccdfb185582d1d4c4309937e6a
2021-03-10 16:52:28 +00:00
Shuo Qian
8b8f2625db
Merge changes from topic "cp-rvc-aosp" into sc-dev
...
* changes:
[automerged blank] Add Emergency callback mode shell command 2p: b201f9b1e6
2021-02-26 22:56:18 +00:00
Andrei-Valentin Onea
c8609a5a6c
Merge "Add genrules for merged system server stubs" am: f91d4e499c am: f86b249734 am: 8e7cddee2f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596559
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iea29172ebf46cabb91e61033aac307c3013c40b4
2021-02-26 13:07:38 +00:00
Remi NGUYEN VAN
9f223cb0b4
Split out the connectivity API surface
...
Split out connectivity APIs to connectivity module directories. This
prepares future move of the connectivity code into a mainline module,
but still keeps it implemented by framework-minus-apex for now: the API
stubs are moved to framework-connectivity.stubs, but the implementation
on device remains in the same place.
This allows moving the connectivity code in/out of APEX with minimal
changes.
BYPASS_INCLUSIVE_LANGUAGE_REASON=Moving files, can't modify released API
Bug: 171540887
Test: device boots, connectivity working
Change-Id: I21c42f032efa6c10e36c749df3183ce9679303a7
2021-02-25 11:01:24 +09:00
Andrei Onea
b2cf181a01
Add genrules for merged system server stubs
...
This is a change analogous to https://r.android.com/1432681 for system
server stubs; it feeds into metalava the stubs for the non-updatable
system server api stubs and the individual mainline module system server
stubs to generate a merged .txt file that will eventually replace the
monolithic one in frameworks/base/services/api/current.txt .
Bug: 177640454
Test: diff frameworks/base/services/api/current.txt \
out/soong/.intermediates/frameworks/base/api/services-system-server-current.txt/gen/system-server-current.txt
Change-Id: I021f59bb91572d28798a97ab8aa687b684599d6c
2021-02-23 14:15:11 +00:00
Bob Badour
8a6a2bce6c
[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
...
Added SPDX-license-identifier-Apache-2.0 to:
apct-tests/perftests/autofill/Android.bp
apct-tests/perftests/blobstore/Android.bp
apct-tests/perftests/core/Android.bp
apct-tests/perftests/core/apps/overlay/Android.bp
apct-tests/perftests/core/apps/reources_manager/Android.bp
apct-tests/perftests/core/jni/Android.bp
apct-tests/perftests/multiuser/Android.bp
apct-tests/perftests/multiuser/apps/dummyapp/Android.bp
apct-tests/perftests/packagemanager/Android.bp
apct-tests/perftests/packagemanager/apps/query-all/Android.bp
apct-tests/perftests/textclassifier/Android.bp
apct-tests/perftests/utils/Android.bp
apct-tests/perftests/windowmanager/Android.bp
apex/Android.bp
apex/blobstore/framework/Android.bp
apex/blobstore/service/Android.bp
apex/jobscheduler/framework/Android.bp
apex/jobscheduler/service/Android.bp
apex/media/Android.bp
apex/media/aidl/Android.bp
apex/media/framework/Android.bp
cmds/am/Android.bp
cmds/app_process/Android.bp
cmds/appops/Android.bp
cmds/appwidget/Android.bp
cmds/backup/Android.bp
cmds/bmgr/Android.bp
cmds/bootanimation/Android.bp
cmds/bu/Android.bp
cmds/content/Android.bp
cmds/dpm/Android.bp
cmds/hid/Android.bp
cmds/hid/jni/Android.bp
cmds/idmap2/Android.bp
cmds/ime/Android.bp
cmds/incident/Android.bp
cmds/incident_helper/Android.bp
cmds/incidentd/Android.bp
cmds/input/Android.bp
cmds/interrupter/Android.bp
cmds/locksettings/Android.bp
cmds/pm/Android.bp
cmds/requestsync/Android.bp
cmds/screencap/Android.bp
cmds/sm/Android.bp
cmds/svc/Android.bp
cmds/telecom/Android.bp
cmds/uiautomator/Android.bp
cmds/uiautomator/cmds/uiautomator/Android.bp
cmds/uiautomator/instrumentation/Android.bp
cmds/uiautomator/library/Android.bp
cmds/vr/Android.bp
cmds/wm/Android.bp
config/Android.bp
core/java/android/service/wallpaper/Android.bp
core/jni/Android.bp
core/sysprop/Android.bp
core/tests/BroadcastRadioTests/Android.bp
core/tests/ConnectivityManagerTest/Android.bp
core/tests/PackageInstallerSessions/Android.bp
core/tests/PlatformCompatFramework/Android.bp
core/tests/bandwidthtests/Android.bp
core/tests/benchmarks/Android.bp
core/tests/bluetoothtests/Android.bp
core/tests/bugreports/Android.bp
core/tests/coretests/Android.bp
core/tests/coretests/BinderDeathRecipientHelperApp/Android.bp
core/tests/coretests/BinderProxyCountingTestApp/Android.bp
core/tests/coretests/BinderProxyCountingTestService/Android.bp
core/tests/coretests/BstatsTestApp/Android.bp
core/tests/coretests/DisabledTestApp/Android.bp
core/tests/coretests/EnabledTestApp/Android.bp
core/tests/coretests/aidl/Android.bp
core/tests/coretests/apks/Android.bp
core/tests/coretests/apks/install/Android.bp
core/tests/coretests/apks/install_bad_dex/Android.bp
core/tests/coretests/apks/install_complete_package_info/Android.bp
core/tests/coretests/apks/install_decl_perm/Android.bp
core/tests/coretests/apks/install_jni_lib/Android.bp
core/tests/coretests/apks/install_jni_lib_open_from_apk/Android.bp
core/tests/coretests/apks/install_loc_auto/Android.bp
core/tests/coretests/apks/install_loc_internal/Android.bp
core/tests/coretests/apks/install_loc_sdcard/Android.bp
core/tests/coretests/apks/install_loc_unspecified/Android.bp
core/tests/coretests/apks/install_use_perm_good/Android.bp
core/tests/coretests/apks/install_uses_feature/Android.bp
core/tests/coretests/apks/install_verifier_bad/Android.bp
core/tests/coretests/apks/install_verifier_good/Android.bp
core/tests/coretests/apks/keyset/Android.bp
core/tests/coretests/apks/locales/Android.bp
core/tests/coretests/apks/overlay_config/Android.bp
core/tests/coretests/apks/version/Android.bp
core/tests/coretests/apks/version_nosys/Android.bp
core/tests/featureflagtests/Android.bp
core/tests/hdmitests/Android.bp
core/tests/hosttests/test-apps/AutoLocTestApp/Android.bp
core/tests/hosttests/test-apps/AutoLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/AutoLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocPermsFLTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/ExternalLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPerms/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.bp
core/tests/hosttests/test-apps/InternalLocTestApp/Android.bp
core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.bp
core/tests/hosttests/test-apps/NoLocTestApp/Android.bp
core/tests/hosttests/test-apps/NoLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/NoLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/SharedUid/32/Android.bp
core/tests/hosttests/test-apps/SharedUid/32/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/64/Android.bp
core/tests/hosttests/test-apps/SharedUid/64/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/dual/Android.bp
core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/java_only/Android.bp
core/tests/hosttests/test-apps/SimpleTestApp/Android.bp
core/tests/hosttests/test-apps/UpdateExtToIntLocTestApp_v1_ext/Android.bp
core/tests/hosttests/test-apps/UpdateExtToIntLocTestApp_v2_int/Android.bp
core/tests/hosttests/test-apps/UpdateExternalLocTestApp_v1_ext/Android.bp
core/tests/hosttests/test-apps/UpdateExternalLocTestApp_v2_none/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_Auto/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_External/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_Internal/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_None/Android.bp
core/tests/mockingcoretests/Android.bp
core/tests/notificationtests/Android.bp
core/tests/overlaytests/device/Android.bp
core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.bp
core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.bp
core/tests/overlaytests/device/test-apps/FrameworkOverlay/Android.bp
core/tests/overlaytests/host/Android.bp
core/tests/overlaytests/remount/Android.bp
core/tests/overlaytests/remount/test-apps/Overlay/Android.bp
core/tests/overlaytests/remount/test-apps/SharedLibrary/Android.bp
core/tests/overlaytests/remount/test-apps/SharedLibraryOverlay/Android.bp
core/tests/overlaytests/remount/test-apps/Target/Android.bp
core/tests/packagemanagertests/Android.bp
core/tests/privacytests/Android.bp
core/tests/screenshothelpertests/Android.bp
core/tests/systemproperties/Android.bp
core/tests/utillib/Android.bp
core/tests/utiltests/Android.bp
core/tests/utiltests/jni/Android.bp
core/tests/uwbtests/Android.bp
core/xsd/Android.bp
core/xsd/vts/Android.bp
data/etc/Android.bp
data/etc/car/Android.bp
data/fonts/Android.bp
data/keyboards/Android.mk
drm/jni/Android.bp
errorprone/Android.bp
graphics/proto/Android.bp
keystore/Android.bp
keystore/tests/Android.bp
libs/WindowManager/Jetpack/Android.bp
libs/WindowManager/Shell/Android.bp
libs/WindowManager/Shell/tests/Android.bp
libs/androidfw/Android.bp
libs/androidfw/fuzz/resourcefile_fuzzer/Android.bp
libs/hostgraphics/Android.bp
libs/incident/Android.bp
libs/input/Android.bp
libs/input/tests/Android.bp
libs/protoutil/Android.bp
libs/services/Android.bp
libs/storage/Android.bp
libs/usb/tests/AccessoryChat/Android.bp
libs/usb/tests/AccessoryChat/accessorychat/Android.bp
location/lib/Android.bp
location/tests/Android.bp
location/tests/locationtests/Android.bp
lowpan/tests/Android.bp
media/Android.bp
media/java/Android.bp
media/java/android/media/tv/tunerresourcemanager/Android.bp
media/jni/Android.bp
media/jni/audioeffect/Android.bp
media/jni/soundpool/Android.bp
media/jni/soundpool/tests/Android.bp
media/lib/remotedisplay/Android.bp
media/lib/signer/Android.bp
media/lib/tvremote/Android.bp
media/lib/tvremote/tests/Android.bp
media/mca/filterfw/Android.bp
media/mca/filterfw/native/Android.bp
media/mca/filterpacks/Android.bp
media/mca/samples/CameraEffectsRecordingSample/Android.bp
media/mca/tests/Android.bp
media/native/midi/Android.bp
media/packages/BluetoothMidiService/Android.bp
media/packages/BluetoothMidiService/tests/unit/Android.bp
media/tests/AudioPolicyTest/Android.bp
media/tests/CameraBrowser/Android.bp
media/tests/EffectsTest/Android.bp
media/tests/MediaDump/Android.bp
media/tests/MediaFrameworkTest/Android.bp
media/tests/MediaRouter/Android.bp
media/tests/MtpTests/Android.bp
media/tests/ScoAudioTest/Android.bp
media/tests/SoundPoolTest/Android.bp
media/tests/TunerTest/Android.bp
media/tests/audiotests/Android.bp
media/tests/players/Android.bp
mime/Android.bp
native/android/Android.bp
native/graphics/jni/Android.bp
native/webview/loader/Android.bp
nfc-extras/Android.bp
nfc-extras/tests/Android.bp
packages/AppPredictionLib/Android.bp
packages/BackupEncryption/Android.bp
packages/BackupEncryption/test/robolectric-integration/Android.bp
packages/BackupEncryption/test/robolectric/Android.bp
packages/BackupEncryption/test/unittest/Android.bp
packages/BackupRestoreConfirmation/Android.bp
packages/CarSystemUI/Android.bp
packages/CarrierDefaultApp/Android.bp
packages/CarrierDefaultApp/tests/unit/Android.bp
packages/CompanionDeviceManager/Android.bp
packages/Connectivity/framework/Android.bp
packages/Connectivity/service/Android.bp
packages/CtsShim/Android.bp
packages/CtsShim/build/Android.bp
packages/CtsShim/build/jni/Android.bp
packages/DynamicSystemInstallationService/Android.bp
packages/DynamicSystemInstallationService/tests/Android.bp
packages/EasterEgg/Android.bp
packages/EncryptedLocalTransport/Android.bp
packages/ExtShared/Android.bp
packages/ExternalStorageProvider/Android.bp
packages/ExternalStorageProvider/tests/Android.bp
packages/FakeOemFeatures/Android.bp
packages/FusedLocation/Android.bp
packages/InputDevices/Android.bp
packages/LocalTransport/Android.bp
packages/PackageInstaller/Android.bp
packages/PrintRecommendationService/Android.bp
packages/PrintSpooler/Android.bp
packages/PrintSpooler/jni/Android.bp
packages/PrintSpooler/tests/outofprocess/Android.bp
packages/SettingsLib/ActionBarShadow/Android.bp
packages/SettingsLib/ActionButtonsPreference/Android.bp
packages/SettingsLib/AdaptiveIcon/Android.bp
packages/SettingsLib/Android.bp
packages/SettingsLib/AppPreference/Android.bp
packages/SettingsLib/BarChartPreference/Android.bp
packages/SettingsLib/DisplayDensityUtils/Android.bp
packages/SettingsLib/EntityHeaderWidgets/Android.bp
packages/SettingsLib/HelpUtils/Android.bp
packages/SettingsLib/LayoutPreference/Android.bp
packages/SettingsLib/ProgressBar/Android.bp
packages/SettingsLib/RadioButtonPreference/Android.bp
packages/SettingsLib/RestrictedLockUtils/Android.bp
packages/SettingsLib/SchedulesProvider/Android.bp
packages/SettingsLib/SearchProvider/Android.bp
packages/SettingsLib/SearchWidget/Android.bp
packages/SettingsLib/SettingsSpinner/Android.bp
packages/SettingsLib/SettingsTheme/Android.bp
packages/SettingsLib/Tile/Android.bp
packages/SettingsLib/Utils/Android.bp
packages/SettingsLib/search/Android.bp
packages/SettingsLib/tests/integ/Android.bp
packages/SettingsLib/tests/robotests/Android.bp
packages/SettingsProvider/Android.bp
packages/SharedStorageBackup/Android.bp
packages/Shell/Android.bp
packages/Shell/tests/Android.bp
packages/SimAppDialog/Android.bp
packages/SoundPicker/Android.bp
packages/StatementService/Android.bp
packages/SystemUI/Android.bp
packages/SystemUI/plugin/Android.bp
packages/SystemUI/plugin/ExamplePlugin/Android.bp
packages/SystemUI/plugin_core/Android.bp
packages/SystemUI/shared/Android.bp
packages/VpnDialogs/Android.bp
packages/WAPPushManager/Android.bp
packages/WAPPushManager/tests/Android.bp
packages/WallpaperBackup/Android.bp
packages/WallpaperCropper/Android.bp
packages/overlays/Android.mk
packages/overlays/tests/Android.bp
packages/services/PacProcessor/Android.bp
packages/services/PacProcessor/jni/Android.bp
packages/services/Proxy/Android.bp
proto/Android.bp
rs/jni/Android.mk
samples/demo/haptic-assessment/Android.bp
sax/tests/saxtests/Android.bp
services/Android.bp
services/accessibility/Android.bp
services/appprediction/Android.bp
services/appwidget/Android.bp
services/autofill/Android.bp
services/backup/Android.bp
services/backup/backuplib/Android.bp
services/companion/Android.bp
services/contentcapture/Android.bp
services/contentsuggestions/Android.bp
services/core/Android.bp
services/core/java/com/android/server/vcn/Android.bp
services/core/jni/Android.bp
services/core/xsd/Android.bp
services/core/xsd/vts/Android.bp
services/coverage/Android.bp
services/devicepolicy/Android.bp
services/incremental/Android.bp
services/midi/Android.bp
services/net/Android.bp
services/people/Android.bp
services/print/Android.bp
services/profcollect/Android.bp
services/restrictions/Android.bp
services/robotests/Android.bp
services/robotests/backup/Android.bp
services/systemcaptions/Android.bp
services/tests/PackageManagerComponentOverrideTests/Android.bp
services/tests/PackageManagerServiceTests/host/Android.bp
services/tests/PackageManagerServiceTests/host/test-apps/Android.bp
services/tests/mockingservicestests/Android.bp
services/tests/rescueparty/Android.bp
services/tests/servicestests/Android.bp
services/tests/servicestests/aidl/Android.bp
services/tests/servicestests/apks/Android.bp
services/tests/servicestests/apks/install-split-base/Android.bp
services/tests/servicestests/apks/install-split-feature-a/Android.bp
services/tests/servicestests/apks/install_intent_filters/Android.bp
services/tests/servicestests/apks/install_uses_sdk/Android.bp
services/tests/servicestests/test-apps/ConnTestApp/Android.bp
services/tests/servicestests/test-apps/JobTestApp/Android.bp
services/tests/servicestests/test-apps/PackageParserApp/Android.bp
services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
services/tests/servicestests/test-apps/SimpleServiceTestApp/Android.bp
services/tests/servicestests/test-apps/SuspendTestApp/Android.bp
services/tests/shortcutmanagerutils/Android.bp
services/tests/uiservicestests/Android.bp
services/tests/wmtests/Android.bp
services/usage/Android.bp
services/usb/Android.bp
services/voiceinteraction/Android.bp
services/wifi/Android.bp
startop/apps/test/Android.bp
startop/iorap/Android.bp
startop/iorap/functional_tests/Android.bp
startop/iorap/stress/Android.bp
startop/iorap/tests/Android.bp
startop/view_compiler/Android.bp
startop/view_compiler/dex_builder_test/Android.bp
test-base/hiddenapi/Android.bp
test-mock/Android.bp
test-runner/tests/Android.bp
tests/AccessibilityEventsLogger/Android.bp
tests/AccessoryDisplay/common/Android.bp
tests/AccessoryDisplay/sink/Android.bp
tests/AccessoryDisplay/source/Android.bp
tests/ActivityManagerPerfTests/stub-app/Android.bp
tests/ActivityManagerPerfTests/test-app/Android.bp
tests/ActivityManagerPerfTests/tests/Android.bp
tests/ActivityManagerPerfTests/utils/Android.bp
tests/ActivityTests/Android.bp
tests/ActivityViewTest/Android.bp
tests/AmSlam/Android.bp
tests/ApkVerityTest/Android.bp
tests/ApkVerityTest/ApkVerityTestApp/Android.bp
tests/ApkVerityTest/block_device_writer/Android.bp
tests/AppLaunch/Android.bp
tests/AppLaunchWear/Android.bp
tests/AppResourcesLoaders/Android.bp
tests/AppResourcesLoaders/Overlay/Android.bp
tests/Assist/Android.bp
tests/AutoVerify/app1/Android.bp
tests/AutoVerify/app2/Android.bp
tests/AutoVerify/app3/Android.bp
tests/AutoVerify/app4/Android.bp
tests/BackgroundDexOptServiceIntegrationTests/Android.bp
tests/BandwidthTests/Android.bp
tests/BatteryWaster/Android.bp
tests/BiDiTests/Android.bp
tests/BlobStoreTestUtils/Android.bp
tests/BootImageProfileTest/Android.bp
tests/BrowserPowerTest/Android.bp
tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp
tests/CameraPrewarmTest/Android.bp
tests/Codegen/Android.bp
tests/Compatibility/Android.bp
tests/CoreTests/android/Android.bp
tests/DataIdleTest/Android.bp
tests/DozeTest/Android.bp
tests/DpiTest/Android.bp
tests/DynamicCodeLoggerIntegrationTests/Android.mk
tests/FeatureSplit/base/Android.bp
tests/FeatureSplit/feature1/Android.bp
tests/FeatureSplit/feature2/Android.bp
tests/FixVibrateSetting/Android.bp
tests/FlickerTests/Android.bp
tests/FlickerTests/test-apps/Android.bp
tests/FlickerTests/test-apps/flickerapp/Android.bp
tests/FrameworkPerf/Android.bp
tests/GamePerformance/Android.bp
tests/GridLayoutTest/Android.bp
tests/HierarchyViewerTest/Android.bp
tests/HugeBackup/Android.bp
tests/HwAccelerationTest/Android.bp
tests/Internal/Android.bp
tests/JankBench/Android.bp
tests/JobSchedulerPerfTests/Android.bp
tests/JobSchedulerTestApp/Android.bp
tests/LargeAssetTest/Android.bp
tests/LegacyAssistant/Android.bp
tests/LocalizationTest/Android.bp
tests/LocationTracker/Android.bp
tests/LotsOfApps/Android.bp
tests/LowStorageTest/Android.bp
tests/ManagedProfileLifecycleStressTest/Android.bp
tests/ManagedProfileLifecycleStressTest/app/DummyDPC/Android.bp
tests/MemoryUsage/Android.bp
tests/MirrorSurfaceTest/Android.bp
tests/NativeProcessesMemoryTest/Android.bp
tests/NetworkSecurityConfigTest/Android.bp
tests/NullHomeTest/Android.bp
tests/OdmApps/Android.bp
tests/OdmApps/app/Android.bp
tests/OdmApps/priv-app/Android.bp
tests/OneMedia/Android.bp
tests/PackageWatchdog/Android.bp
tests/PlatformCompatGating/Android.bp
tests/PlatformCompatGating/test-rules/Android.bp
tests/ProtoInputStreamTests/Android.bp
tests/RemoteDisplayProvider/Android.bp
tests/RenderThreadTest/Android.bp
tests/RollbackTest/Android.bp
tests/SerialChat/Android.bp
tests/ServiceCrashTest/Android.bp
tests/SharedLibrary/client/Android.bp
tests/SharedLibrary/lib/Android.bp
tests/ShowWhenLockedApp/Android.bp
tests/SmokeTest/Android.bp
tests/SmokeTest/tests/Android.bp
tests/SmokeTestApps/Android.bp
tests/SoundTriggerTestApp/Android.bp
tests/Split/Android.bp
tests/StagedInstallTest/Android.bp
tests/StatusBar/Android.bp
tests/SurfaceComposition/Android.bp
tests/SurfaceControlViewHostTest/Android.bp
tests/SystemMemoryTest/device/Android.bp
tests/SystemMemoryTest/host/Android.bp
tests/SystemUIDemoModeController/Android.bp
tests/TaskOrganizerTest/Android.bp
tests/TelephonyCommonTests/Android.bp
tests/TouchLatency/Android.bp
tests/TransformTest/Android.bp
tests/TtsTests/Android.bp
tests/UiBench/Android.bp
tests/UsageReportingTest/Android.bp
tests/UsageStatsPerfTests/Android.bp
tests/UsageStatsTest/Android.bp
tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.bp
tests/UsbHostExternalManagmentTest/AoapTestHost/Android.bp
tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.bp
tests/UsbManagerTests/Android.bp
tests/UsbManagerTests/lib/Android.bp
tests/UsbTests/Android.bp
tests/UsesFeature2Test/Android.bp
tests/VectorDrawableTest/Android.bp
tests/VoiceEnrollment/Android.bp
tests/VoiceInteraction/Android.bp
tests/WallpaperTest/Android.bp
tests/WindowAnimationJank/Android.bp
tests/WindowInsetsTests/Android.bp
tests/appwidgets/AppWidgetHostTest/Android.bp
tests/appwidgets/AppWidgetProviderTest/Android.bp
tests/backup/Android.mk
tests/benchmarks/Android.bp
tests/libs-permissions/Android.bp
tests/net/Android.bp
tests/net/common/Android.bp
tests/net/deflake/Android.bp
tests/net/integration/Android.bp
tests/net/jni/Android.bp
tests/net/smoketest/Android.bp
tests/notification/Android.bp
tests/permission/Android.bp
tests/privapp-permissions/Android.bp
tests/testables/Android.bp
tests/testables/tests/Android.bp
tests/utils/StubIME/Android.bp
tests/utils/hostutils/Android.bp
tests/utils/testutils/Android.bp
tests/vcn/Android.bp
tools/aapt/Android.bp
tools/aapt2/Android.bp
tools/aapt2/integration-tests/AutoVersionTest/Android.bp
tools/aapt2/integration-tests/BasicTest/Android.bp
tools/aapt2/integration-tests/MergeOnlyTest/LeafLib/Android.mk
tools/aapt2/integration-tests/MergeOnlyTest/LocalLib/Android.mk
tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk
tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk
tools/aapt2/integration-tests/StaticLibTest/App/Android.bp
tools/aapt2/integration-tests/StaticLibTest/LibOne/Android.bp
tools/aapt2/integration-tests/StaticLibTest/LibTwo/Android.bp
tools/aapt2/integration-tests/SymlinkTest/Android.bp
tools/bit/Android.bp
tools/codegen/Android.bp
tools/dump-coverage/Android.bp
tools/incident_report/Android.bp
tools/incident_section_gen/Android.bp
tools/lock_agent/Android.bp
tools/locked_region_code_injection/Android.bp
tools/obbtool/Android.bp
tools/powermodel/Android.bp
tools/preload-check/Android.bp
tools/preload-check/device/Android.bp
tools/preload/loadclass/Android.bp
tools/processors/staledataclass/Android.bp
tools/processors/view_inspector/Android.bp
tools/protologtool/Android.bp
tools/sdkparcelables/Android.bp
tools/split-select/Android.bp
tools/streaming_proto/Android.bp
tools/validatekeymaps/Android.bp
wifi/java/Android.bp
wifi/tests/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
libs/hwui/Android.bp
native/webview/plat_support/Android.bp
obex/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
SPDX-license-identifier-CC-BY SPDX-license-identifier-CPL-1.0
SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
SPDX-license-identifier-W3C legacy_unencumbered
to:
Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
legacy_unencumbered
to:
core/java/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CPL-1.0
to:
test-base/Android.bp
test-runner/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL
to:
core/res/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0
to:
libs/usb/Android.bp
libs/usb/tests/accessorytest/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
to:
tools/preload/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
SPDX-license-identifier-Unicode-DFS
to:
api/Android.bp
boot/Android.bp
cmds/device_config/Android.bp
cmds/settings/Android.bp
core/api/Android.bp
core/tests/coretests/certs/Android.bp
core/tests/overlaytests/remount/test-apps/certs/Android.bp
core/tests/overlaytests/remount/test-apps/overlaid_apex/Android.bp
core/tests/overlaytests/remount/test-apps/overlay_apex/Android.bp
libs/tracingproxy/Android.bp
services/startop/Android.bp
test-legacy/Android.mk
tests/ApkVerityTest/testdata/Android.bp
tests/TransitionTests/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: Ib9737d8fb5ef5b90a2c14fe71f1a571079edcf02
Merged-In: Ib9737d8fb5ef5b90a2c14fe71f1a571079edcf02
2021-02-21 20:12:24 +00:00
Anton Hansson
efbe5db94e
Merge "Add compat checking of the merged APIs" am: 0feadf2006 am: 2ac7949b57 am: 457c516204
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587218
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I14f662fb58c62123d4a390ccba0145bdea2fee81
2021-02-17 11:46:15 +00:00
Anton Hansson
457c516204
Merge "Add compat checking of the merged APIs" am: 0feadf2006 am: 2ac7949b57
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587218
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I892a8acbb6378e1833703805967e2c1039b87d38
2021-02-17 11:08:50 +00:00
Anton Hansson
0feadf2006
Merge "Add compat checking of the merged APIs"
2021-02-17 10:02:37 +00:00
Bob Badour
051ef786ac
[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
...
Added SPDX-license-identifier-Apache-2.0 to:
apct-tests/perftests/autofill/Android.bp
apct-tests/perftests/blobstore/Android.bp
apct-tests/perftests/core/Android.bp
apct-tests/perftests/core/apps/overlay/Android.bp
apct-tests/perftests/core/apps/reources_manager/Android.bp
apct-tests/perftests/core/jni/Android.bp
apct-tests/perftests/multiuser/Android.bp
apct-tests/perftests/multiuser/apps/dummyapp/Android.bp
apct-tests/perftests/packagemanager/Android.bp
apct-tests/perftests/packagemanager/apps/query-all/Android.bp
apct-tests/perftests/textclassifier/Android.bp
apct-tests/perftests/utils/Android.bp
apct-tests/perftests/windowmanager/Android.bp
apex/Android.bp
apex/blobstore/framework/Android.bp
apex/blobstore/service/Android.bp
apex/jobscheduler/framework/Android.bp
apex/jobscheduler/service/Android.bp
apex/media/Android.bp
apex/media/aidl/Android.bp
apex/media/framework/Android.bp
cmds/am/Android.bp
cmds/app_process/Android.bp
cmds/appops/Android.bp
cmds/appwidget/Android.bp
cmds/backup/Android.bp
cmds/bmgr/Android.bp
cmds/bootanimation/Android.bp
cmds/bu/Android.bp
cmds/content/Android.bp
cmds/dpm/Android.bp
cmds/hid/Android.bp
cmds/hid/jni/Android.bp
cmds/idmap2/Android.bp
cmds/ime/Android.bp
cmds/incident/Android.bp
cmds/incident_helper/Android.bp
cmds/incidentd/Android.bp
cmds/input/Android.bp
cmds/interrupter/Android.bp
cmds/locksettings/Android.bp
cmds/pm/Android.bp
cmds/requestsync/Android.bp
cmds/screencap/Android.bp
cmds/sm/Android.bp
cmds/svc/Android.bp
cmds/telecom/Android.bp
cmds/uiautomator/Android.bp
cmds/uiautomator/cmds/uiautomator/Android.bp
cmds/uiautomator/instrumentation/Android.bp
cmds/uiautomator/library/Android.bp
cmds/vr/Android.bp
cmds/wm/Android.bp
config/Android.bp
core/java/android/service/wallpaper/Android.bp
core/jni/Android.bp
core/sysprop/Android.bp
core/tests/BroadcastRadioTests/Android.bp
core/tests/ConnectivityManagerTest/Android.bp
core/tests/PackageInstallerSessions/Android.bp
core/tests/PlatformCompatFramework/Android.bp
core/tests/bandwidthtests/Android.bp
core/tests/benchmarks/Android.bp
core/tests/bluetoothtests/Android.bp
core/tests/bugreports/Android.bp
core/tests/coretests/Android.bp
core/tests/coretests/BinderDeathRecipientHelperApp/Android.bp
core/tests/coretests/BinderProxyCountingTestApp/Android.bp
core/tests/coretests/BinderProxyCountingTestService/Android.bp
core/tests/coretests/BstatsTestApp/Android.bp
core/tests/coretests/DisabledTestApp/Android.bp
core/tests/coretests/EnabledTestApp/Android.bp
core/tests/coretests/aidl/Android.bp
core/tests/coretests/apks/Android.bp
core/tests/coretests/apks/install/Android.bp
core/tests/coretests/apks/install_bad_dex/Android.bp
core/tests/coretests/apks/install_complete_package_info/Android.bp
core/tests/coretests/apks/install_decl_perm/Android.bp
core/tests/coretests/apks/install_jni_lib/Android.bp
core/tests/coretests/apks/install_jni_lib_open_from_apk/Android.bp
core/tests/coretests/apks/install_loc_auto/Android.bp
core/tests/coretests/apks/install_loc_internal/Android.bp
core/tests/coretests/apks/install_loc_sdcard/Android.bp
core/tests/coretests/apks/install_loc_unspecified/Android.bp
core/tests/coretests/apks/install_use_perm_good/Android.bp
core/tests/coretests/apks/install_uses_feature/Android.bp
core/tests/coretests/apks/install_verifier_bad/Android.bp
core/tests/coretests/apks/install_verifier_good/Android.bp
core/tests/coretests/apks/keyset/Android.bp
core/tests/coretests/apks/locales/Android.bp
core/tests/coretests/apks/overlay_config/Android.bp
core/tests/coretests/apks/version/Android.bp
core/tests/coretests/apks/version_nosys/Android.bp
core/tests/featureflagtests/Android.bp
core/tests/hdmitests/Android.bp
core/tests/hosttests/test-apps/AutoLocTestApp/Android.bp
core/tests/hosttests/test-apps/AutoLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/AutoLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocPermsFLTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/ExternalLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPerms/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.bp
core/tests/hosttests/test-apps/InternalLocTestApp/Android.bp
core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.bp
core/tests/hosttests/test-apps/NoLocTestApp/Android.bp
core/tests/hosttests/test-apps/NoLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/NoLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/SharedUid/32/Android.bp
core/tests/hosttests/test-apps/SharedUid/32/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/64/Android.bp
core/tests/hosttests/test-apps/SharedUid/64/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/dual/Android.bp
core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/java_only/Android.bp
core/tests/hosttests/test-apps/SimpleTestApp/Android.bp
core/tests/hosttests/test-apps/UpdateExtToIntLocTestApp_v1_ext/Android.bp
core/tests/hosttests/test-apps/UpdateExtToIntLocTestApp_v2_int/Android.bp
core/tests/hosttests/test-apps/UpdateExternalLocTestApp_v1_ext/Android.bp
core/tests/hosttests/test-apps/UpdateExternalLocTestApp_v2_none/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_Auto/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_External/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_Internal/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_None/Android.bp
core/tests/mockingcoretests/Android.bp
core/tests/notificationtests/Android.bp
core/tests/overlaytests/device/Android.bp
core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.bp
core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.bp
core/tests/overlaytests/device/test-apps/FrameworkOverlay/Android.bp
core/tests/overlaytests/host/Android.bp
core/tests/overlaytests/remount/Android.bp
core/tests/overlaytests/remount/test-apps/Overlay/Android.bp
core/tests/overlaytests/remount/test-apps/SharedLibrary/Android.bp
core/tests/overlaytests/remount/test-apps/SharedLibraryOverlay/Android.bp
core/tests/overlaytests/remount/test-apps/Target/Android.bp
core/tests/packagemanagertests/Android.bp
core/tests/privacytests/Android.bp
core/tests/screenshothelpertests/Android.bp
core/tests/systemproperties/Android.bp
core/tests/utillib/Android.bp
core/tests/utiltests/Android.bp
core/tests/utiltests/jni/Android.bp
core/tests/uwbtests/Android.bp
core/xsd/Android.bp
core/xsd/vts/Android.bp
data/etc/Android.bp
data/etc/car/Android.bp
data/fonts/Android.bp
data/keyboards/Android.mk
drm/jni/Android.bp
errorprone/Android.bp
graphics/proto/Android.bp
keystore/Android.bp
keystore/tests/Android.bp
libs/WindowManager/Jetpack/Android.bp
libs/WindowManager/Shell/Android.bp
libs/WindowManager/Shell/tests/Android.bp
libs/androidfw/Android.bp
libs/androidfw/fuzz/resourcefile_fuzzer/Android.bp
libs/hostgraphics/Android.bp
libs/incident/Android.bp
libs/input/Android.bp
libs/input/tests/Android.bp
libs/protoutil/Android.bp
libs/services/Android.bp
libs/storage/Android.bp
libs/usb/tests/AccessoryChat/Android.bp
libs/usb/tests/AccessoryChat/accessorychat/Android.bp
location/lib/Android.bp
location/tests/Android.bp
location/tests/locationtests/Android.bp
lowpan/tests/Android.bp
media/Android.bp
media/java/Android.bp
media/java/android/media/tv/tunerresourcemanager/Android.bp
media/jni/Android.bp
media/jni/audioeffect/Android.bp
media/jni/soundpool/Android.bp
media/jni/soundpool/tests/Android.bp
media/lib/remotedisplay/Android.bp
media/lib/signer/Android.bp
media/lib/tvremote/Android.bp
media/lib/tvremote/tests/Android.bp
media/mca/filterfw/Android.bp
media/mca/filterfw/native/Android.bp
media/mca/filterpacks/Android.bp
media/mca/samples/CameraEffectsRecordingSample/Android.bp
media/mca/tests/Android.bp
media/native/midi/Android.bp
media/packages/BluetoothMidiService/Android.bp
media/packages/BluetoothMidiService/tests/unit/Android.bp
media/tests/AudioPolicyTest/Android.bp
media/tests/CameraBrowser/Android.bp
media/tests/EffectsTest/Android.bp
media/tests/MediaDump/Android.bp
media/tests/MediaFrameworkTest/Android.bp
media/tests/MediaRouter/Android.bp
media/tests/MtpTests/Android.bp
media/tests/ScoAudioTest/Android.bp
media/tests/SoundPoolTest/Android.bp
media/tests/TunerTest/Android.bp
media/tests/audiotests/Android.bp
media/tests/players/Android.bp
mime/Android.bp
native/android/Android.bp
native/graphics/jni/Android.bp
native/webview/loader/Android.bp
nfc-extras/Android.bp
nfc-extras/tests/Android.bp
packages/AppPredictionLib/Android.bp
packages/BackupEncryption/Android.bp
packages/BackupEncryption/test/robolectric-integration/Android.bp
packages/BackupEncryption/test/robolectric/Android.bp
packages/BackupEncryption/test/unittest/Android.bp
packages/BackupRestoreConfirmation/Android.bp
packages/CarSystemUI/Android.bp
packages/CarrierDefaultApp/Android.bp
packages/CarrierDefaultApp/tests/unit/Android.bp
packages/CompanionDeviceManager/Android.bp
packages/Connectivity/framework/Android.bp
packages/Connectivity/service/Android.bp
packages/CtsShim/Android.bp
packages/CtsShim/build/Android.bp
packages/CtsShim/build/jni/Android.bp
packages/DynamicSystemInstallationService/Android.bp
packages/DynamicSystemInstallationService/tests/Android.bp
packages/EasterEgg/Android.bp
packages/EncryptedLocalTransport/Android.bp
packages/ExtShared/Android.bp
packages/ExternalStorageProvider/Android.bp
packages/ExternalStorageProvider/tests/Android.bp
packages/FakeOemFeatures/Android.bp
packages/FusedLocation/Android.bp
packages/InputDevices/Android.bp
packages/LocalTransport/Android.bp
packages/PackageInstaller/Android.bp
packages/PrintRecommendationService/Android.bp
packages/PrintSpooler/Android.bp
packages/PrintSpooler/jni/Android.bp
packages/PrintSpooler/tests/outofprocess/Android.bp
packages/SettingsLib/ActionBarShadow/Android.bp
packages/SettingsLib/ActionButtonsPreference/Android.bp
packages/SettingsLib/AdaptiveIcon/Android.bp
packages/SettingsLib/Android.bp
packages/SettingsLib/AppPreference/Android.bp
packages/SettingsLib/BarChartPreference/Android.bp
packages/SettingsLib/DisplayDensityUtils/Android.bp
packages/SettingsLib/EntityHeaderWidgets/Android.bp
packages/SettingsLib/HelpUtils/Android.bp
packages/SettingsLib/LayoutPreference/Android.bp
packages/SettingsLib/ProgressBar/Android.bp
packages/SettingsLib/RadioButtonPreference/Android.bp
packages/SettingsLib/RestrictedLockUtils/Android.bp
packages/SettingsLib/SchedulesProvider/Android.bp
packages/SettingsLib/SearchProvider/Android.bp
packages/SettingsLib/SearchWidget/Android.bp
packages/SettingsLib/SettingsSpinner/Android.bp
packages/SettingsLib/SettingsTheme/Android.bp
packages/SettingsLib/Tile/Android.bp
packages/SettingsLib/Utils/Android.bp
packages/SettingsLib/search/Android.bp
packages/SettingsLib/tests/integ/Android.bp
packages/SettingsLib/tests/robotests/Android.bp
packages/SettingsProvider/Android.bp
packages/SharedStorageBackup/Android.bp
packages/Shell/Android.bp
packages/Shell/tests/Android.bp
packages/SimAppDialog/Android.bp
packages/SoundPicker/Android.bp
packages/StatementService/Android.bp
packages/SystemUI/Android.bp
packages/SystemUI/plugin/Android.bp
packages/SystemUI/plugin/ExamplePlugin/Android.bp
packages/SystemUI/plugin_core/Android.bp
packages/SystemUI/shared/Android.bp
packages/VpnDialogs/Android.bp
packages/WAPPushManager/Android.bp
packages/WAPPushManager/tests/Android.bp
packages/WallpaperBackup/Android.bp
packages/WallpaperCropper/Android.bp
packages/overlays/Android.mk
packages/overlays/tests/Android.bp
packages/services/PacProcessor/Android.bp
packages/services/PacProcessor/jni/Android.bp
packages/services/Proxy/Android.bp
proto/Android.bp
rs/jni/Android.mk
samples/demo/haptic-assessment/Android.bp
sax/tests/saxtests/Android.bp
services/Android.bp
services/accessibility/Android.bp
services/appprediction/Android.bp
services/appwidget/Android.bp
services/autofill/Android.bp
services/backup/Android.bp
services/backup/backuplib/Android.bp
services/companion/Android.bp
services/contentcapture/Android.bp
services/contentsuggestions/Android.bp
services/core/Android.bp
services/core/java/com/android/server/vcn/Android.bp
services/core/jni/Android.bp
services/core/xsd/Android.bp
services/core/xsd/vts/Android.bp
services/coverage/Android.bp
services/devicepolicy/Android.bp
services/incremental/Android.bp
services/midi/Android.bp
services/net/Android.bp
services/people/Android.bp
services/print/Android.bp
services/profcollect/Android.bp
services/restrictions/Android.bp
services/robotests/Android.bp
services/robotests/backup/Android.bp
services/systemcaptions/Android.bp
services/tests/PackageManagerComponentOverrideTests/Android.bp
services/tests/PackageManagerServiceTests/host/Android.bp
services/tests/PackageManagerServiceTests/host/test-apps/Android.bp
services/tests/mockingservicestests/Android.bp
services/tests/rescueparty/Android.bp
services/tests/servicestests/Android.bp
services/tests/servicestests/aidl/Android.bp
services/tests/servicestests/apks/Android.bp
services/tests/servicestests/apks/install-split-base/Android.bp
services/tests/servicestests/apks/install-split-feature-a/Android.bp
services/tests/servicestests/apks/install_intent_filters/Android.bp
services/tests/servicestests/apks/install_uses_sdk/Android.bp
services/tests/servicestests/test-apps/ConnTestApp/Android.bp
services/tests/servicestests/test-apps/JobTestApp/Android.bp
services/tests/servicestests/test-apps/PackageParserApp/Android.bp
services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
services/tests/servicestests/test-apps/SimpleServiceTestApp/Android.bp
services/tests/servicestests/test-apps/SuspendTestApp/Android.bp
services/tests/shortcutmanagerutils/Android.bp
services/tests/uiservicestests/Android.bp
services/tests/wmtests/Android.bp
services/usage/Android.bp
services/usb/Android.bp
services/voiceinteraction/Android.bp
services/wifi/Android.bp
startop/apps/test/Android.bp
startop/iorap/Android.bp
startop/iorap/functional_tests/Android.bp
startop/iorap/stress/Android.bp
startop/iorap/tests/Android.bp
startop/view_compiler/Android.bp
startop/view_compiler/dex_builder_test/Android.bp
test-base/hiddenapi/Android.bp
test-mock/Android.bp
test-runner/tests/Android.bp
tests/AccessibilityEventsLogger/Android.bp
tests/AccessoryDisplay/common/Android.bp
tests/AccessoryDisplay/sink/Android.bp
tests/AccessoryDisplay/source/Android.bp
tests/ActivityManagerPerfTests/stub-app/Android.bp
tests/ActivityManagerPerfTests/test-app/Android.bp
tests/ActivityManagerPerfTests/tests/Android.bp
tests/ActivityManagerPerfTests/utils/Android.bp
tests/ActivityTests/Android.bp
tests/ActivityViewTest/Android.bp
tests/AmSlam/Android.bp
tests/ApkVerityTest/Android.bp
tests/ApkVerityTest/ApkVerityTestApp/Android.bp
tests/ApkVerityTest/block_device_writer/Android.bp
tests/AppLaunch/Android.bp
tests/AppLaunchWear/Android.bp
tests/AppResourcesLoaders/Android.bp
tests/AppResourcesLoaders/Overlay/Android.bp
tests/Assist/Android.bp
tests/AutoVerify/app1/Android.bp
tests/AutoVerify/app2/Android.bp
tests/AutoVerify/app3/Android.bp
tests/AutoVerify/app4/Android.bp
tests/BackgroundDexOptServiceIntegrationTests/Android.bp
tests/BandwidthTests/Android.bp
tests/BatteryWaster/Android.bp
tests/BiDiTests/Android.bp
tests/BlobStoreTestUtils/Android.bp
tests/BootImageProfileTest/Android.bp
tests/BrowserPowerTest/Android.bp
tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp
tests/CameraPrewarmTest/Android.bp
tests/Codegen/Android.bp
tests/Compatibility/Android.bp
tests/CoreTests/android/Android.bp
tests/DataIdleTest/Android.bp
tests/DozeTest/Android.bp
tests/DpiTest/Android.bp
tests/DynamicCodeLoggerIntegrationTests/Android.mk
tests/FeatureSplit/base/Android.bp
tests/FeatureSplit/feature1/Android.bp
tests/FeatureSplit/feature2/Android.bp
tests/FixVibrateSetting/Android.bp
tests/FlickerTests/Android.bp
tests/FlickerTests/test-apps/Android.bp
tests/FlickerTests/test-apps/flickerapp/Android.bp
tests/FrameworkPerf/Android.bp
tests/GamePerformance/Android.bp
tests/GridLayoutTest/Android.bp
tests/HierarchyViewerTest/Android.bp
tests/HugeBackup/Android.bp
tests/HwAccelerationTest/Android.bp
tests/Internal/Android.bp
tests/JankBench/Android.bp
tests/JobSchedulerPerfTests/Android.bp
tests/JobSchedulerTestApp/Android.bp
tests/LargeAssetTest/Android.bp
tests/LegacyAssistant/Android.bp
tests/LocalizationTest/Android.bp
tests/LocationTracker/Android.bp
tests/LotsOfApps/Android.bp
tests/LowStorageTest/Android.bp
tests/ManagedProfileLifecycleStressTest/Android.bp
tests/ManagedProfileLifecycleStressTest/app/DummyDPC/Android.bp
tests/MemoryUsage/Android.bp
tests/MirrorSurfaceTest/Android.bp
tests/NativeProcessesMemoryTest/Android.bp
tests/NetworkSecurityConfigTest/Android.bp
tests/NullHomeTest/Android.bp
tests/OdmApps/Android.bp
tests/OdmApps/app/Android.bp
tests/OdmApps/priv-app/Android.bp
tests/OneMedia/Android.bp
tests/PackageWatchdog/Android.bp
tests/PlatformCompatGating/Android.bp
tests/PlatformCompatGating/test-rules/Android.bp
tests/ProtoInputStreamTests/Android.bp
tests/RemoteDisplayProvider/Android.bp
tests/RenderThreadTest/Android.bp
tests/RollbackTest/Android.bp
tests/SerialChat/Android.bp
tests/ServiceCrashTest/Android.bp
tests/SharedLibrary/client/Android.bp
tests/SharedLibrary/lib/Android.bp
tests/ShowWhenLockedApp/Android.bp
tests/SmokeTest/Android.bp
tests/SmokeTest/tests/Android.bp
tests/SmokeTestApps/Android.bp
tests/SoundTriggerTestApp/Android.bp
tests/Split/Android.bp
tests/StagedInstallTest/Android.bp
tests/StatusBar/Android.bp
tests/SurfaceComposition/Android.bp
tests/SurfaceControlViewHostTest/Android.bp
tests/SystemMemoryTest/device/Android.bp
tests/SystemMemoryTest/host/Android.bp
tests/SystemUIDemoModeController/Android.bp
tests/TaskOrganizerTest/Android.bp
tests/TelephonyCommonTests/Android.bp
tests/TouchLatency/Android.bp
tests/TransformTest/Android.bp
tests/TtsTests/Android.bp
tests/UiBench/Android.bp
tests/UsageReportingTest/Android.bp
tests/UsageStatsPerfTests/Android.bp
tests/UsageStatsTest/Android.bp
tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.bp
tests/UsbHostExternalManagmentTest/AoapTestHost/Android.bp
tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.bp
tests/UsbManagerTests/Android.bp
tests/UsbManagerTests/lib/Android.bp
tests/UsbTests/Android.bp
tests/UsesFeature2Test/Android.bp
tests/VectorDrawableTest/Android.bp
tests/VoiceEnrollment/Android.bp
tests/VoiceInteraction/Android.bp
tests/WallpaperTest/Android.bp
tests/WindowAnimationJank/Android.bp
tests/WindowInsetsTests/Android.bp
tests/appwidgets/AppWidgetHostTest/Android.bp
tests/appwidgets/AppWidgetProviderTest/Android.bp
tests/backup/Android.mk
tests/benchmarks/Android.bp
tests/libs-permissions/Android.bp
tests/net/Android.bp
tests/net/common/Android.bp
tests/net/deflake/Android.bp
tests/net/integration/Android.bp
tests/net/jni/Android.bp
tests/net/smoketest/Android.bp
tests/notification/Android.bp
tests/permission/Android.bp
tests/privapp-permissions/Android.bp
tests/testables/Android.bp
tests/testables/tests/Android.bp
tests/utils/StubIME/Android.bp
tests/utils/hostutils/Android.bp
tests/utils/testutils/Android.bp
tests/vcn/Android.bp
tools/aapt/Android.bp
tools/aapt2/Android.bp
tools/aapt2/integration-tests/AutoVersionTest/Android.bp
tools/aapt2/integration-tests/BasicTest/Android.bp
tools/aapt2/integration-tests/MergeOnlyTest/LeafLib/Android.mk
tools/aapt2/integration-tests/MergeOnlyTest/LocalLib/Android.mk
tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk
tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk
tools/aapt2/integration-tests/StaticLibTest/App/Android.bp
tools/aapt2/integration-tests/StaticLibTest/LibOne/Android.bp
tools/aapt2/integration-tests/StaticLibTest/LibTwo/Android.bp
tools/aapt2/integration-tests/SymlinkTest/Android.bp
tools/bit/Android.bp
tools/codegen/Android.bp
tools/dump-coverage/Android.bp
tools/incident_report/Android.bp
tools/incident_section_gen/Android.bp
tools/lock_agent/Android.bp
tools/locked_region_code_injection/Android.bp
tools/obbtool/Android.bp
tools/powermodel/Android.bp
tools/preload-check/Android.bp
tools/preload-check/device/Android.bp
tools/preload/loadclass/Android.bp
tools/processors/staledataclass/Android.bp
tools/processors/view_inspector/Android.bp
tools/protologtool/Android.bp
tools/sdkparcelables/Android.bp
tools/split-select/Android.bp
tools/streaming_proto/Android.bp
tools/validatekeymaps/Android.bp
wifi/java/Android.bp
wifi/tests/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
libs/hwui/Android.bp
native/webview/plat_support/Android.bp
obex/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
SPDX-license-identifier-CC-BY SPDX-license-identifier-CPL-1.0
SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
SPDX-license-identifier-W3C legacy_unencumbered
to:
Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
legacy_unencumbered
to:
core/java/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CPL-1.0
to:
test-base/Android.bp
test-runner/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL
to:
core/res/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0
to:
libs/usb/Android.bp
libs/usb/tests/accessorytest/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
to:
tools/preload/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
SPDX-license-identifier-Unicode-DFS
to:
api/Android.bp
boot/Android.bp
cmds/device_config/Android.bp
cmds/settings/Android.bp
core/api/Android.bp
core/tests/coretests/certs/Android.bp
core/tests/overlaytests/remount/test-apps/certs/Android.bp
core/tests/overlaytests/remount/test-apps/overlaid_apex/Android.bp
core/tests/overlaytests/remount/test-apps/overlay_apex/Android.bp
libs/tracingproxy/Android.bp
services/startop/Android.bp
test-legacy/Android.mk
tests/ApkVerityTest/testdata/Android.bp
tests/TransitionTests/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: Ic44d662936d1ff0cae7fbe915932b37aa4e4869a
Merged-in: I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06
2021-02-16 04:09:57 -08:00
Gavin Corkery
338545d785
Add framework-scheduling libraries
...
Test: Builds
Bug: 161353402
Change-Id: I39b2ff9ea4c08bb9bc699c807d0efa9ff092829e
2021-02-15 21:30:18 +00:00
Anton Hansson
0d6eae6f1d
Add compat checking of the merged APIs
...
Compare the current merged txt to the last one checked into
prebuilts/sdk. For the system and module-lib APIs, also feed
the current public API in as the "base" API.
Bug: 174847574
Test: m frameworks-base-api-{,system-,module-lib-}current-compat
Change-Id: I7d4274ec1561be131c4f0298b49c05b24f03cb06
2021-02-15 17:30:22 +00:00
Yan Yan
f8b973c3f6
Add IKE stub to main Android SDK
...
This CL is required for converting IKE from a shared library to
a jar in the boot classpath.
Bug: 177266501
Test: build, flash, boot
Change-Id: I10759d22eaba4861b7d7f283b551156f09f54675
Merged-In: I10759d22eaba4861b7d7f283b551156f09f54675
2021-02-09 17:23:55 -08:00
Yan Yan
1357a421a2
Add IKE stub to main Android SDK
...
This CL is required for converting IKE from a shared library to
a jar in the boot classpath.
Bug: 177266501
Test: build, flash, boot
Change-Id: I10759d22eaba4861b7d7f283b551156f09f54675
2021-02-09 10:24:11 -08:00
Hai Zhang
591e121df6
Add framework-permission-s java_sdk_library.
...
This will host the moved framework classes for role.
The class RoleFrameworkPlaceholder is added because the build won't
pass if there isn't any java source.
Bug: 158736025
Test: build
Change-Id: Icabab2cc956d6c7c07a6217256d23a8402960307
2021-01-23 00:19:59 -08:00
Anton Hansson
f118549ef7
Merge "Dist more API txt files" am: 45b39d81c4 am: d787b0501a am: 5e4e7ceca9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555176
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia5b9c0e91e49db2edf2706616667a9e681fed649
2021-01-21 14:02:57 +00:00
Anton Hansson
85785fec8a
Dist more API txt files
...
Add disting of the following for the sdk:
- android-non-updatable.txt
- android-non-updatable-removed.txt
- removed.txt
Bug: 158544979
Test: m sdk dist && inspect out/dist/apistubs
Change-Id: I5f628f4fcfc13f67105ee3b2760274e900fc1e34
2021-01-20 20:23:34 +00:00
Anton Hansson
b5048e482e
Merge "Unbundle ART API from android-non-updatable" am: 5a4fc1d6e1 am: a81a5f1bdb am: f31935f2e9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533282
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibae612368c7cedd9812925f632bfbbf5e7c844d1
2020-12-29 12:27:11 +00:00
Anton Hansson
fc948d8675
Unbundle ART API from android-non-updatable
...
Stop tracking the ART APIs in the non-updatable current.txt, and
instead add in the txt/srcjar/jar files produced by the art module's
java_sdk_library.
Bug: 173606718
Test: manual last_released check of merged api txt (b/174847574 to
automate)
Change-Id: I446a381f2b364a114ce391b99a13742d6769f14d
2020-12-23 14:51:17 +00:00
Paul Duffin
24c79cdb88
Merge "Unbundle i18n API from android-non-updatable" am: 17e6d5b6a3 am: 3322b2800a am: f358ccece0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513291
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I576e27b966d5e7b731a3f944bdee353e2cac9106
2020-12-11 10:50:29 +00:00
Paul Duffin
5a4e8f234d
Unbundle i18n API from android-non-updatable
...
This removes the i18n source from the non-updatable stubs which removes
them from the frameworks/base/core/api files too. The API is still
protected by both the build and Gerrit review as the API is specified
in the external/icu/android_icu4j/api/public/ directory.
The i18n stubs source is used instead of the implementation source for
generating the JavaDoc. That revealed a minor issue with metalava which
is fixed in this topic.
The i18n stubs library was statically included alongside the conscrypt
stubs library so it will still appear in the monolothic android.jar.
Bug: 174344410
Test: m offline-sdk-docs
- check that i18n classes are present
m android_stubs_current android_system_stubs_current android_test_stubs_current
- check that i18n classes are present in each jar
m droid
Change-Id: I744c8bac54a8a5518ca0eca2a7700abbfa0997f4
2020-12-10 11:23:19 +00:00
Jeff Sharkey
0ab7007631
resolve merge conflicts of 358f0d4fc8 to master
...
Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c
2020-12-08 11:01:05 -07:00
Jeff Sharkey
52b9862f87
Improve OWNERS coverage across frameworks/base/.
...
As general background, OWNERS files expedite code reviews by helping
code authors quickly find relevant reviewers, and they also ensure
that stakeholders are involved in code changes in their areas.
Some teams under frameworks/base/ have been using OWNERS files
successfully for many years, and we're ready to expand them to cover
more areas. Here's the historical coverage statistics for the last
two years of changes before these new OWNERS changes land:
-- 56% of changes are fully covered by OWNERS
-- 17% of changes are partially covered by OWNERS
-- 25% of changes have no OWNERS coverage
Working closely with team leads, we've now identified clear OWNERS on
a per-package basis, and we're using "include" directives whenever
possible to to simplify future maintenance. With this extensive
effort, we've now improved our coverage as follows:
-- 98% of changes are fully covered by OWNERS
-- 1% of changes are partially covered by OWNERS
-- 1% of changes have no OWNERS coverage
This specific change is automatically generated by a script that
identifies relevant "include" directives.
Bug: 174932174
Test: manual
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Merged-In: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813
Change-Id: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813
2020-12-08 08:36:28 -07:00
Anton Hansson
c9dbe6ed8b
Merge "Remove system-*.txt files"
2020-11-18 15:22:15 +00:00
Anton Hansson
90f03fa392
Remove current.txt files
...
Nothing depends on these anymore. The same data is available through
the build artifact framework-base-api-current.txt.
Bug: 171029603
Test: m checkbuild
Change-Id: I13d9373f7174e2ff2bc54122a1fcfae0b7f7293c
Merged-In: I13d9373f7174e2ff2bc54122a1fcfae0b7f7293c
(cherry picked from commit b5ec8a9a10
2020-11-17 00:16:59 +00:00
Anton Hansson
b5ec8a9a10
Remove current.txt files
...
Nothing depends on these anymore. The same data is available through
the build artifact framework-base-api-current.txt.
Bug: 171029603
Test: m checkbuild
Change-Id: I13d9373f7174e2ff2bc54122a1fcfae0b7f7293c
2020-11-16 18:13:18 +00:00
Sally Yuen
67bf1480cf
Merge "Change forceBoldText to fontWeightAdjustment in Configuration"
2020-11-16 16:55:48 +00:00
Nate Jiang
3ce8ab9631
Merge changes from topics "mergedNetwork", "wifiInfoSubId"
...
* changes:
Add API to get Subscription Id
[Suggestion] API to set carrier merged network
2020-11-14 06:55:16 +00:00
Hangyu Kuang
c318d8819a
Merge "transcoding: Unhide ApplicationMediaCapabilities"
2020-11-14 06:09:26 +00:00
Janis Danisevskis
ebd964a086
Keystore 2.0: Shim around the basic functionality of Keystore 2.0
...
This patch adds a shim around the Keystore 2.0 AIDL spec. The new shim
is modularized like the AIDL spec into the base Keystore module
Keystore2, the security level specific interface KeystoreSecurityLevel,
and the operation specific interface KeystoreOperation.
Other system maintenance specific interfaces have yet to be added.
Bug: 159476414
Bug: 171305684
Test: None
Change-Id: I070f73739e4b37ce10568939ac666e40b14a52a8
2020-11-13 19:55:39 -08:00
hkuang
10acecb23b
transcoding: Unhide ApplicationMediaCapabilities
...
CTS-Coverage-Bug:172074159
Bug: 169849854
Test: Unit test
Change-Id: Ib043bf8e52c6868cd1dfeff5552755d394c4c851
2020-11-13 19:09:34 -08:00
Nate Jiang
115861dac3
Merge "[Suggestion] Add API to help app get user approval status."
2020-11-13 23:02:26 +00:00
Songchun Fan
e2086954e9
[pm/incremental] add @FloatRange in the new LauncherActivityInfo API
...
Addressing the comment in b/171804873
BUG: 171804873
Test: builds
Change-Id: Ie7980973572443007f9205535ab9da575d3ea97b
2020-11-13 21:25:38 +00:00
Sally
b2ebd0d535
Change forceBoldText to fontWeightAdjustment in Configuration
...
Convey the weight adjustment instead of a binary on/off
Bug: b/170966021, b/110991537
Test: atest CtsContentTestCases
Change-Id: I4f8de658cb49c2e3d81ce6b25338d6e7c9a5e789
2020-11-13 19:45:18 +00:00
Nikita Dubrovsky
00813be0ed
Merge "Update onReceiveContent() logic for app vs platform processing"
2020-11-13 15:54:02 +00:00
Anton Hansson
144ee28238
Remove system-*.txt files
...
Nothing depends on these anymore. The same data is available through
the build artifact framework-base-api-system-current.txt.
Bug: 171029603
Test: m checkbuild
Change-Id: I8d5f0a132aa307d88fbc2bd7521cdd4bdd8c6cee
Merged-In: I8d5f0a132aa307d88fbc2bd7521cdd4bdd8c6cee
(cherry picked from commit d5cba3455f
2020-11-13 09:57:06 +00:00
Nate Jiang
30b8b6b940
[Suggestion] Add API to help app get user approval status.
...
Bug: 160648511
Test: atest android.net.wifi
Change-Id: If93db55b1e0bc33dd7b82dad4e297c442b628e44
2020-11-12 16:40:00 -08:00
Nate Jiang
6df0e8bf6c
[Suggestion] API to set carrier merged network
...
Create a new API to set carrier merged network suggestion
Bug: 172867186
Test: atest android.net.wifi
Change-Id: I5ddbc8b15e361e44c508e40dac10211cbd39ab10
2020-11-12 14:47:30 -08:00
Nikita Dubrovsky
a25346bf0c
Update onReceiveContent() logic for app vs platform processing
...
Previously onReceiveContent() would only invoke the app-configured
callback if the MIME type of the content matched one of the declared
MIME types for the callback. This change updates onReceiveContent()
to always invoke the listener if one is set (regardless of the MIME
type of the content). To delegate processing to the platform, the
app's listener can return some or all of the passed-in content. To
make this easy for apps to implement, the Payload class and its
Builder now provide some convenience methods to conditionally
partition the content.
Reasons for this change:
* Checking the MIME types could be an expensive operation. On SDKs prior
to S, ClipData does not keep track of the MIME types of individual
items, so for a ClipData that contains multiple items, checking the MIME
types requires making at least one RPC call per item.
* Allowing the listener to delegate processing to the platform via its
return value enables us to limit the API surface (we don't need to
expose TextViewOnReceiveContentListener as a public API, nor equivalent
classes for other types of views such as WebView).
* An app that wants to customize the platform behavior for coercing
content to text would previously need to declare "*/*" as the MIME type
for the callback (in order to be invoked for all content). But this
would make it impossible for features to know whether the app would
actually accept a particular type of content or just coerce it to text
(e.g. should the soft keyboard show GIF suggestions when the declared
MIME type is "*/*"). With the new logic the app's listener is always
invoked and can decide which content to process vs delegate to the
platform vs reject completely.
Bug: 170191676
Bug: 152068298
Test: atest CtsViewTestCases:ViewOnReceiveContentTest
Test: atest CtsWidgetTestCases:TextViewOnReceiveContentTest
Test: atest FrameworksCoreTests:TextViewOnReceiveContentTest
Change-Id: Ie48b6fe0b2ae4b014c371b5dc40248221947c6bf
2020-11-12 14:19:57 -08:00
Tyler Gunn
8185680306
Merge "Move offered RTP header extension types API."
2020-11-12 22:12:41 +00:00
Shuo Qian
83cc1b62f0
Merge "Introduce hasCompanionInCallServiceAccess API"
2020-11-12 21:51:29 +00:00
Sooraj Sasindran
eca4612629
Merge "Provide API to retrive dual connected bandwidth"
2020-11-12 21:34:48 +00:00
Eran Messeri
cb1fecb4b4
Merge "Implement setRequiredPasswordComplexity"
2020-11-12 21:17:19 +00:00
Anton Hansson
7bfa3bf333
Merge "Remove system-*.txt files"
2020-11-12 18:55:52 +00:00
Allen Su
2e838fc70e
Merge "Declare audio codec bitrate and bandwidth" am: b04ef45226 am: 1bb3473fdf am: 21604689d0 am: 38fb2b571a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494041
Change-Id: Ib5e5df0edfb0cb448c3c424b24d24f2f4e9ccf42
2020-11-12 18:21:03 +00:00
Allen Su
38fb2b571a
Merge "Declare audio codec bitrate and bandwidth" am: b04ef45226 am: 1bb3473fdf am: 21604689d0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494041
Change-Id: Id0ca7eb919c6da094dd5a7be990f4aa38526aa23
2020-11-12 18:07:10 +00:00
Allen Su
b04ef45226
Merge "Declare audio codec bitrate and bandwidth"
2020-11-12 17:08:42 +00:00
Andy Hung
89c6513542
Merge "AudioFormat: Add ENCODING_PCM_32BIT ENCODING_PCM_24BIT_PACKED"
2020-11-12 16:58:57 +00:00
Anton Hansson
d5cba3455f
Remove system-*.txt files
...
Nothing depends on these anymore. The same data is available through
the build artifact framework-base-api-system-current.txt.
Bug: 171029603
Test: m checkbuild
Change-Id: I8d5f0a132aa307d88fbc2bd7521cdd4bdd8c6cee
2020-11-12 15:52:40 +00:00
