Skip to content
Snippets Groups Projects
  1. Feb 18, 2021
    • Greg Kaiser's avatar
      Revert "Add a system TextToSpeech implementation that initiates ..." · c09430c1
      Greg Kaiser authored
      Revert "Add CTS tests for TextToSpeech connection related functi..."
      
      Revert submission 13547465-ttsproxy
      
      Reason for revert: Setup wizard crashes due to "Service not registered: android.speech.tts.TextToSpeech$SystemConnection"
      Reverted Changes:
      Id4059e460:Add CTS tests for TextToSpeech connection related ...
      Ie17800bae:Add a system TextToSpeech implementation that init...
      
      Bug: 180519958
      Change-Id: Ie43c485bd4d0f76f8bb0a1dc77d6d85d46ff8377
      Test: Locally reverted this change and no longer see the exception in SUW we saw before.
      c09430c1
  2. Feb 17, 2021
    • Alexandre Elias's avatar
      Fix transition animation when going back twice · ae5517e9
      Alexandre Elias authored
      The logic in ag/5108931 was intended to suppress the next return
      animation if it would cross a task boundary, while preserving return
      animations in all other cases.  However, it accidentally caused
      excessive suppressions in the case of repeated back button presses.  The
      reason is that although the sending activity is indeed only topOfTask
      when moving forward cross-task, it's *always* topOfTask when pressing
      back, so the state of the sending activity doesn't contain sufficient
      information to feed this logic.
      
      This patch changes to suppress when the receiving activity is task root,
      which is a more direct and reliable signal.  (By definition, the return
      transition from an activity will cross a task boundary if and only if
      it's the task root.)
      
      Fixes: 177780499
      Test: New test in ag/13593522
      
      Change-Id: Ia5751da6122dc1ddb557f45318712185fa0b3df9
      ae5517e9
    • Cody Kesting's avatar
      Define VcnStatusCallback#onGatewayConnectionError callback. · fe052394
      Cody Kesting authored
      This CL updates VcnStatusCallback to have a onGatewayConnctionError()
      function. This function will be used to notify callers when Gateway
      Connection errors occur, such as authentication failures or the session
      unexpectedly dying.
      
      Bug: 163433613
      Test: atest FrameworksVcnTests
      Change-Id: I9ea6e9e850eb9d8b0d374c5447895f1f04121696
      fe052394
    • Jiashen Wang's avatar
      Add the immutable flag to EuiccManager calls in RecoverySystem · 6851cf0c
      Jiashen Wang authored
      Bug: 170432460
      Test: refactoring CL. Existing unit tests still pass
      Change-Id: Ibce939eec341cb9f572d13a33762cc5bc6e2ef42
      Merged-In: Ibce939eec341cb9f572d13a33762cc5bc6e2ef42
      6851cf0c
    • Anna Zappone's avatar
      Add listener for conversation changes · 4b65ce05
      Anna Zappone authored
      Add hidden ConversationListener and registration in PeopleManager
      for People Tiles to register a listener to individual
      conversation storage changes for targetted updates.
      
      Test: DataManagerTest, PeopleServiceTest, PeopleManagerTest
      Bug: 178792356
      Change-Id: I0cab6913c138d6ac515fed74741dd62bf967772b
      4b65ce05
    • Bob Badour's avatar
      [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base · 784edef8
      Bob Badour authored
      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: Ic44d662936d1ff0cae7fbe915932b37aa4e4869a
      784edef8
    • Igor Murashkin's avatar
      pm: Require manifest.json for .dm (dex-metadata) files. · abe2776d
      Igor Murashkin authored
      Example file:
        $> unzip CtsApkVerityTestAppPrebuilt.dm manifest.json ; cat manifest.json
        {
          "packageName": "android.appsecurity.cts.apkveritytestapp",
          "versionCode": 30
        }
        
      Cherry-picked from 12af11d6
      
      Test: adb install-multiple -r foo.apk foo.dm
      Test: atest FrameworksServicesTests:com.android.server.pm.dex.DexMetadataHelperTest
      Bug: 179295368
      Merged-In: I7a3c442bb27da5948bc9ead146c77213de6b56cc
      Change-Id: I7a3c442bb27da5948bc9ead146c77213de6b56cc
      abe2776d
    • Kevin Chyn's avatar
      Retrieve authenticatorId when already targetUserId · e43e5b13
      Kevin Chyn authored
      Previous change ag/13413165 stopped the framework from retrieving
      authenticatorId when the current user is already the target user.
      However, this happens immediately after enrollment, since enroll
      and getAuthenticatorId are separate operations. So, add a way to
      retrieve authenticatorId only when necessary.
      
      Fixes: 179737483
      Bug: 178018968
      Test: manual
      Change-Id: I71673fc672c60733616634a2fdf3153a3b2d02e1
      e43e5b13
    • Michael Wachenschwanz's avatar
      Make CpuPowerCalculator's Estimators available to com.android.internal · af23d81f
      Michael Wachenschwanz authored
      BatteryStats needs the power_profile Cpu constants to smear the measured
      CPU Cluster energies across UIDs. Using the CpuPowerProfileCalculator to
      get the calculation decreases the chance of someone accidentally
      diverging estimated and measured CPU power calculations.
      
      Bug: 180079165
      Test: tbd
      Change-Id: I474cd019d177bd07f2ae48a47b83a82e4074ed4f
      af23d81f
    • Yomna Nasser's avatar
      Implementation of "Enable 2G" for Settings. · 8fa54b7c
      Yomna Nasser authored
      (1) Adds KEY_HIDE_ENABLE_2G_BOOL to CarrierConfigManager, and
      (2) Adds new reason ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G.
      
      Test: manual & atest -c Enable2gPreferenceControllerTest
      Bug: b/163168917
      Change-Id: I81052549f8dde491697c35365320145fd24c3842
      8fa54b7c
    • Yan Yan's avatar
      Store VcnControlPlaneConfig in VcnGatewayConnectionConfig · a9c1bab8
      Yan Yan authored
      This CL requires callers to set a VcnControlPlaneConfig for
      building VcnGatewayConnectionConfig
      
      Bug: 163604823
      Test: FrameworksVcnTests (new tests added)
      Change-Id: If45cb2aa866d627f3bb9762309fe8b07bf729ba8
      a9c1bab8
    • Yan Yan's avatar
      Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig · c4fbd6a9
      Yan Yan authored
      VcnControlPlaneConfig contains control plane configuration for
      a VCN gateway connection. VcnControlPlaneIkeConfig is a
      subclass that contains IKE configuration.
      
      The followup CL will store VcnControlPlaneConfig in
      VcnGatewayConnectionConfig.
      
      Bug: 163604823
      Test: FrameworksVcnTests(new tests added)
      Change-Id: If7a85ae44e77fc4477b56ffa50c6e99ee96132d0
      c4fbd6a9
    • Shuo Qian's avatar
      Add APIs for updating, query 5G slicing status · bdf65336
      Shuo Qian authored
      Test: atest DevicePolicyManagerTest
      Bug: 178655595
      Change-Id: I6f823be6737f7c7b3dc918230cbb927fac97c6eb
      Merged-In: I6f823be6737f7c7b3dc918230cbb927fac97c6eb
      (cherry picked from commit 1f4ea44b)
      bdf65336
    • Felipe Leme's avatar
      New API: DevicePolicyManager.listForegroundAffiliatedUsers() · 002e214a
      Felipe Leme authored
      Bug: 173541467
      Bug: 179163496
      
      Test: m update-api
      
      Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.DeviceOwnerTest#testListForegroundAffiliatedUsers_onlyForegroundUser,testListForegroundAffiliatedUsers_extraUser,testListForegroundAffiliatedUsers_notDeviceOwner,testListForegroundAffiliatedUsers_notAffiliated,testListForegroundAffiliatedUsers_affiliated
      
      Change-Id: I520dc35da627d7cb89f6ff2d7010fc04af1b01f7
      002e214a
    • Todd Kennedy's avatar
      Use @InstallScenario instead of @InstallReason · 6fc18b4f
      Todd Kennedy authored
      Test: builds
      Bug: none
      Change-Id: Ifb753f89eab42c6afc6b4d87e7291f45ccdb8d6f
      6fc18b4f
    • James.cf Lin's avatar
      [RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism · 603c2317
      James.cf Lin authored
      Expose OPTIONS portion of capability exchange APIs.
      
      Bug: 174166957
      Test: atest CtsTelephonyTestCases
      Change-Id: I21277fce055f31400f2018b6f81102225cb7c7c8
      603c2317
    • Anthony Stange's avatar
      Enforce nanoapp permissions for ContextHub APIs · ab42e66b
      Anthony Stange authored
      Adds the following behavior:
      1) Ensures nanoapp messages aren't delivered to host apps unless they
      hold the required permissions
      2) Ensures that host apps continue to hold the required permissions set
      
      Also pipes the package name for callback clients since their package
      name can't be determined on the other side of the binder.
      
      Bug: 166846988
      Test: Disable permissions on host client and verify that nanoapp and
      host lose communication after ~1 minute
      Test: Re-enable permissions on host client and verify host receives
      appropriate callback
      
      Change-Id: I14af504f0b230f6ce15852f16fc8b174fdd52252
      ab42e66b
    • Michael Wachenschwanz's avatar
      Add cpu proc file read throttling enabling/disabling · 0726d59b
      Michael Wachenschwanz authored
      To properly attribute the new MeasureEnergy data for CPU, the cpu kernel
      uid file reads needs to occur everytime the CPU MeasuredEnergy is read.
      If throttling is necessary, it will need to be handled by
      BatteryExternalStatsWorker for both the cpu kernel file reads and the
      MeasuredEnergy read to make sure the data is in sync.
      
      Bug: 180079165
      Test: atest FrameworksCoreTests:com.android.internal.os.KernelCpuUidUserSysTimeReaderTest
      Change-Id: I90ebad48d780872a611605689e0d25678da66f27
      0726d59b
    • Jay Aliomer's avatar
      Revert "Wallpaper Local color sampling" · 3fa5fe0a
      Jay Aliomer authored
      Revert "Implement local color extraction"
      
      Revert "Implement local color extraction"
      
      Revert submission 13553866-wallpaper-local-color-extraction-sc-dev
      
      Reason for revert: b/180490435 
      Reverted Changes:
      I5755525f9:Wallpaper Local color sampling
      I5487881c0:Implement local color extraction
      Icbab7c6c2:Implement local color extraction
      
      Change-Id: I1cf02a24555167165959e5c4f0bd25b655bd6b6e
      3fa5fe0a
    • Anna Malova's avatar
      Use SystemClock.elapsedRealtime() to record WebView startup timestamps. · f649ddfc
      Anna Malova authored
      ag/13435848 introduces timestamp collections based on
      System.currentTimeMillis but elapsedRealtime is a better
      choice for a interval timing.
      
      Bug: 180489435
      Test: n/a
      Change-Id: If7b29cbe90e8bba76bccb42a5bc570c08b75c9e7
      f649ddfc
    • Jorim Jaggi's avatar
      Add GPU completion to FrameMetrics (1/3) · 71db8892
      Jorim Jaggi authored
      - Add SurfaceStatsCallback to TransactionCompletedListener
      - Register a callback in RenderProxy to be called when we have
      surface stats from SF via the BLAST callback.
      - Instead of finishing a frame for frame metrics reporting
      immediately, wait until BLAST callback fires, note GPU completion
      time and finish frame.
      - Expose GPU_COMPLETION in FrameMetrics
      - Modify TOTAL_DURATION to also include GPU_COMPLETION
      
      Test: FrameMetricsListenerTest
      Fixes: 171046219
      Change-Id: I16fa1d80cfc4e7a5527c18fec7e885409f17ee4d
      71db8892
    • Shawn Willden's avatar
      Add support for app-generated attestation keys. · bffded44
      Shawn Willden authored
      This allows apps to request that AndroidKeyStore generate attestation
      keys that can be used to sign attestations of other keys that the app
      generates or imports.
      
      Bug: 163606833
      Test: atest CtsKeystoreTests
      Change-Id: I943a6922271cbe909cb3a9d67021663b5646aa70
      bffded44
    • TreeHugger Robot's avatar
      Add new attributes for widget sizing controls. · b9806031
      TreeHugger Robot authored
      Design doc: go/widget-sizing-api-dd
      
      New attributes added:
      * maxResizeWidth
      * maxResizeHeight
      * targetCellWidth
      * targetCellHeight
      
      Bug: 179807199
      Test: atest FrameworksServicesTests:AppWidgetServiceImplTest
      Change-Id: Icadc73da9bd010e42459735493f452cb892e5744
      b9806031
    • Flavio Fiszman's avatar
      Creates PeopleManager API isConversation · d243c60e
      Flavio Fiszman authored
      Change-Id: I075cd72363ba0ea0e84bb57fe017fce20e051862
      Test: atest DataManagerTest
      Bug: 180122164
      d243c60e
    • shubang's avatar
      Unhide media metrics APIs part 2: playback metrics · f1ab80c0
      shubang authored
      Bug: 167036690
      Test: mmm
      Change-Id: I333aa0d5de72f5c89813df40a7c9fcc59423d635
      f1ab80c0
    • shubang's avatar
      Unhide media metrics APIs part 2: Network event · f2bf0fd2
      shubang authored
      Bug: 167036690
      Test: mmm
      Change-Id: Idd96c19fca5e87e73d565f9141ea4bac70d42b60
      f2bf0fd2
    • Jooyung Han's avatar
      Fix self-assign error in SimPhonebookContract · 8ab5cf67
      Jooyung Han authored
      Bug: 180472752
      Test: atest
      FrameworksTelephonyTests: com.android.internal.telephony.uicc.IccUtilsTest
      TeleServiceTests: SimPhonebookProviderTest
      Change-Id: I1a8c0dabee3ca90fcdeca263a4c943e01fbae75e
      8ab5cf67
    • shubang's avatar
      Unhide media metrics APIs part 2: Track change event · 87b3131b
      shubang authored
      Bug: 167036690
      Test: mmm
      Change-Id: I44bfe61b8d1bc1ce4166cd99bf356d54fc7e2517
      87b3131b
    • shubang's avatar
      Unhide media metrics APIs part 2: Error event · 9fa5a1ac
      shubang authored
      Bug: 167036690
      Test: mmm
      Change-Id: I4cdc70eab8a9c92b35d745441008e330c53b7622
      9fa5a1ac
    • Suprabh Shukla's avatar
      Adding a permission to protect exact alarms · d0bbe0b9
      Suprabh Shukla authored
      Added a new permission to protect the alarm manager APIs setAlarmClock
      and setExactAndAllowWhileIdle. The change will apply to apps targeting
      API S and above.
      - The permission will be granted by default to apps that request it.
      - This will be a user facing permission as these APIs allow for exact
      scheduling, and an app should generally only use them when scheduling
      work on behalf of the user. This means the user can revoke it when they
      want.
      - Alarms set with this API will also be allowed to start FGS from the
      background.
      - Quota on exact, allow-while-idle alarms has been relaxed generously,
      while alarm-clocks remain totally uninhibited.
      - Apps that are exempted from battery via <allow-in-power-save> in the
      sysconfig, can still use exact, allow-while-idle alarms without the
      permission, but with lower quota.
      - Inexact, allow-while-idle alarms do not require this permission, but
      will *not* be allowed to start FGS from the background.
      - A new API to query the state of this permission is included.
      
      Test: atest FrameworksMockingServicesTests:com.android.server.alarm
      atest CtsAlarmManagerTestCases
      
      BYPASS_INCLUSIVE_LANGUAGE_REASON=Existing APIs
      
      Bug: 171306433
      Change-Id: Ifb6a3f3c42316b1c83fe6960920501f5e0ee51f2
      d0bbe0b9
    • Remi NGUYEN VAN's avatar
      Split parcelable .aidl files to aidl-export · 8d25d67d
      Remi NGUYEN VAN authored
      The one-line "parcelable X" files need to be imported by targets that do
      not build against SDK (the SDK has prebuilt definitions), so prepare a
      dedicated directory for them.
      This avoids having users of the classes include the whole src/
      directory, which could contain definitions for classes that are not part
      of the public API, so should not be imported.
      
      Also move back to frameworks/base/core some .aidl definitions that
      were separated from their associated class.
      
      Bug: 171540887
      Test: m
      Change-Id: I7432fe4c87cd3cab04dcb6185c9a4f3f84376549
      8d25d67d
    • Lucas Dupin's avatar
      Add neutral palette, rename main and accent · 04b02c9d
      Lucas Dupin authored
      Added new netrual colors palette, and renamed main and accent palettes
      to primary and secondary respectively.
      This was done to align with the new color spec.
      
      Test: atest SystemPalette
      Test: atest ColorTest
      Test: atest ThemeOverlayControllerTest
      Bug: 171916625
      Change-Id: Ia56eb1e96a01c3ff8a64de0e1d632d4436bc9048
      04b02c9d
    • Kevin Chyn's avatar
      Try to ensure tests run sequentially · d6d23e13
      Kevin Chyn authored
      Asynchronous operations that are performed in close() (such as
      cleanupInternalState()) should complete before close() finishes.
      Otherwise, we risk subsequent tests starting and causing racey
      conditions while cleanup has not finished yet.
      
      Fixes: 180192766
      Test: atest CtsBiometricsTestCases
      Test: atest com.android.server.biometrics
      Change-Id: I3fdb3fe0be59e826d0c14e14a2590ccdde568774
      d6d23e13
    • Kevin Chyn's avatar
      Update RemovalClient to support new biometric AIDL · b2888343
      Kevin Chyn authored
      The new AIDL interfaces accept a list of IDs to remove. Note that
      the new interfaces explicitly do NOT support using "remove(0)"
      to remove all enrollments.
      
      Fixes: 179338634
      Test: atest CtsBiometricsTestCases
      Test: atest com.android.server.biometrics
      Change-Id: I59f6e607ff876541f049ac70d06046815eba7632
      b2888343
    • Cody Kesting's avatar
      Define VcnStatusCallback register/unregister. · f14145e3
      Cody Kesting authored
      This CL defines VcnStatusCallbacks, which are callbacks used to register
      for status updates to a specific subscription group. These Callbacks may
      be registered with VcnManager at any time, but will only be invoked for
      the specifies subscription group and only if the registering app has
      carrier privileges for that subscription.
      
      Bug: 163433613
      Test: atest FrameworksVcnTests
      Change-Id: Iefd284ae2d09676d195e2a12bf660be3596da59b
      f14145e3
    • Benedict Wong's avatar
      Expose Basic VCN API surface · 049c180a
      Benedict Wong authored
      This change exposes the Basics of the VCN API surface, including:
      - VCN Configurations
      - VCN Gateway Configuration superclass (Builder in subclasses)
      - VcnManger with configuration management APIs
      
      Bug: 168833866
      Test: atest FrameworksVcnTests
      Test: atest android.net.vcn
      Change-Id: Ia1b3597d903dd84267f66546a90437f9ac45b2de
      049c180a
    • Bill Yi's avatar
      Import translations. DO NOT MERGE ANYWHERE · cfa1a0c1
      Bill Yi authored
      Auto-generated-cl: translation import
      Change-Id: I1589dfab87b8ddc127fa148de9c693fc5b678bce
      cfa1a0c1
    • shubang's avatar
      Unhide media metrics APIs part 2: State event · babb29d4
      shubang authored
      Bug: 167036690
      Test: atest android.cts.statsdatom.media
      Change-Id: I8baf2cab6180a325bc105fee9e5b6ad94e28a374
      babb29d4
    • Dmitri Plotnikov's avatar
      Remove unused method · 0b80f843
      Dmitri Plotnikov authored
      Bug: 158137862
      Test: N/A
      Change-Id: I819a9c25d1bc9f99c5206603a1172d4e847f54cf
      0b80f843
    • Brad Ebinger's avatar
      Move to ACCESS_RCS_USER_CAPABILITY_EXCHANGE for UCE APIs · 2254a577
      Brad Ebinger authored
      Move from MODIFY_PHONE_STATE to ACCESS_RCS_USER_CAPABILITY_EXCHANGE
      permission for associated APIs.
      
      Bug: 174861641
      Bug: 154764486
      Test: atest CtsTelephonyTestCases
      Change-Id: I978161a230ce23e17d3b16cc92c3e82ea1cbb407
      2254a577
Loading