Skip to content
Snippets Groups Projects
  1. Feb 17, 2021
    • 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
  2. Feb 16, 2021
    • Bob Badour's avatar
      [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base · 051ef786
      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: I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06
      051ef786
  3. Feb 15, 2021
  4. Feb 12, 2021
    • Ryan Mitchell's avatar
      Remove duplicate idmap classes from services.jar · febbc33e
      Ryan Mitchell authored
      The idmap aidl classes are linked into the framework.jar. They do not
      need to be linked into the services.jar as well. Remove them.
      
      Bug: 180067820
      Test: forrest
      Change-Id: Ic8637794cd3a2ea39bad7c0aa6596ca9fe30c45a
      febbc33e
  5. Feb 10, 2021
    • Ryan Mitchell's avatar
      OverlayManager Fabricated RROs · 6a2ca782
      Ryan Mitchell authored
      Adds registering and unregistering of FabricatedOverlay to the OMS.
      The process that creates the fabricated overlays owns it and is the
      only process allowed to unregister it.
      
      When a fabricated overlay is registered, overlay settings for it are
      initialized in all users. When a fabricated overlay is unregistered,
      it is disabled and removed from all users. When a new user is created,
      it will be able to use the fabricated overlay as well.
      
      On boot, fabricated overlays that are not referenced in overlay
      settings will be deleted.
      
      When the package that created the fabricated overlay is uninstalled,
      its fabricated overlays are also unregistered.
      
      Bug: 172471315
      Test: atest OverlayDeviceTests
      Change-Id: I0539656f4c919246b13129579b0286c08a398dc2
      6a2ca782
    • Yan Yan's avatar
      Add IKE stub to main Android SDK · f8b973c3
      Yan Yan authored
      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
      f8b973c3
  6. Feb 09, 2021
    • Yan Yan's avatar
      Add IKE stub to main Android SDK · 1357a421
      Yan Yan authored
      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
      1357a421
  7. Feb 06, 2021
  8. Feb 03, 2021
  9. Feb 02, 2021
  10. Feb 01, 2021
    • Kohsuke Yatoh's avatar
      Integration test for updatable system font. · bc718220
      Kohsuke Yatoh authored
      This test:
      (1) signs a font file with the test key.
      (2) side-loads the test cert to the device under test.
      (3) verifies that the signed font file can be installed.
      
      The device must be rootable for doing step (2).
      
      Bug: 176939176
      Test: atest UpdatableSystemFontTest
      Change-Id: I7a9b614aa3c77589c3495b663cb76056ba657006
      bc718220
  11. Jan 29, 2021
  12. Jan 28, 2021
    • Daulet Zhanguzin's avatar
      Update frameworks to use unbundled version of BouncyCastle. · 59444d5b
      Daulet Zhanguzin authored
      Previously BouncyCastle methods were exposed as libcore APIs (@CorePlatformApi), which no longer possible when ART is updatable module (and can't guarantee BouncyCastle API stability)
      
      Bug: 154796679
      Test: Treehugger
      
      Change-Id: I908681841a6766de88761767c77c4e2d4b5f56d5
      59444d5b
  13. Jan 24, 2021
    • Hai Zhang's avatar
      Move role into module. · 0b4f1718
      Hai Zhang authored
      These changes have to be in this CL together because:
      
      - Code in service-permission depends on IRoleManager in
      framework-permission, so the APIs in framework-permission and the code
      in service-permission need to be moved together.
      
      - The changes to service-permission build rules doesn't make sense
      without the code moved in, so they have to be together as well.
      
      Other details:
      
      - framework-annotations: Several annotations are added into
      framework-annoatations. Since the discussion with API council seems to
      allow user IDs in system server in-process APIs, @UserIdInt and
      @AppIdInt is added. @MainThread and @AnyThread is added since
      @WorkerThread is already added. @CallSuper is added since @CheckResult
      is also already added and they are similar in terms of category of
      functionality.
      
      - framework-permission-s-shared-srcs: 3 classes (and 2 AIDL files)
      from framework is copied as shared source files and jarjared for
      framework-permission, and an additional 3 is added for
      service-permission as service-permission-shared-srcs. Similar to
      framework-wifi and service-wifi, the 3 classes in framework-permission
      is also available to service-permission by the stub library
      framework-permission-pre-jarjar, and the other 3 classes used only for
      service-permission is included separately to minimize our impact on
      classes loaded into boot classpath. framework-permission and
      service-permission shares the same jarjar rules to make sure the
      classes remain available, and for the same reason framework-permission
      cannot be shrank during any optimization.
      
      - framework-permission-s-shared: A java_library target for
      framework-permission-shared-srcs is created to make sure that the
      public classes won't be counted as APIs, as it would be if directly
      included as srcs for framework-permission
      java_sdk_library. service-permission-shared is the same thing for
      service-permission.
      
      - framework-permission-s: A new java_sdk_library target created to be
      loaded into bootclasspath by Android S+.
      
      - Dumpsys Protobuf: The dumpsys protobuf
      file (rolemanagerservice.proto) is moved into the module, and both the
      platform (incident.proto) and the module uses protoc-gen-javastream to
      generate the Java classes from it. This should be fine since it's a
      "source level inclusion", and we jarjar the generated classes in our
      module to avoid conflict with platform copies.
      
      Bug: 158736025
      Test: manual
      Test: device boots, default apps can be changed successfully.
      Change-Id: I1914774f631e51d0c587a7e527a1c9bc05ee1595
      0b4f1718
  14. Jan 23, 2021
    • Hai Zhang's avatar
      Add framework-permission-s java_sdk_library. · 591e121d
      Hai Zhang authored
      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
      591e121d
  15. Jan 19, 2021
  16. Jan 18, 2021
    • Louis Chang's avatar
      Revert "Integrate IKeystoreAuthorization aidl's addAuthToken wit..." · 589975d1
      Louis Chang authored
      Revert submission 1519257-rename_auth_service
      
      Reason for revert: breaking WM presubmit, b/177787180
      Reverted Changes:
      Ib847b68d4:Integrate IKeystoreAuthorization aidl's addAuthTok...
      I7893ab452:Integrate IKeystoreAuthorization aidl's addAuthTok...
      I4a092119c:Implement addAuthToken method of IKeystoreAuthoriz...
      
      Change-Id: Iea9bf7e7b3d1e968bbbe39f4ec08dcc3577cee07
      589975d1
  17. Jan 15, 2021
  18. Jan 13, 2021
    • Amy Zhang's avatar
      Move Tuner resource updating from Tuner java into Tuner client · 39a3fa46
      Amy Zhang authored
      Note that the main goal of this CL is to
      move the resource updating with TunerResourceManager
      from Tuner java into Tuner native client library.
      
      This requires TunerResourceManager aidl interface to generate
      both ndk and java library.
      
      Also this CL removes the previously manually defined
      TunerResourceManager java interface and use the automatically
      generated java lib instead.
      
      Some Android Services, such as MediaCase/TIF, that previously used the
      manually defined TRM java APIs are changed to use the auto gen APIs
      in this CL.
      
      Test: atest android.media.tv.tuner.cts on Cuttlefish
      Bug: 174095851
      Change-Id: I46acdd2f118d5b082aa162c680661a304b4f628b
      39a3fa46
  19. Jan 12, 2021
    • Alex Buynytskyy's avatar
      Per package read timeouts. · aa8e95ea
      Alex Buynytskyy authored
      Bug: 162345970
      Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest
      
      Change-Id: I2599db1ed8827fff16387c11254a5d607f27ea46
      aa8e95ea
  20. Dec 29, 2020
    • Baligh Uddin's avatar
      Adjust visibility rules for migration · a958b1a8
      Baligh Uddin authored
      Adjusting visibility to accomodate migration of
      frameworks/opt/net/wifi to packages/modules/Wifi.
      
      BUG: 137323948
      Test: TH
      Change-Id: Ib4c481f6e17507fb5a423be83e04f4cbebfd10f5
      Exempt-From-Owner-Approval: Internal CP of aosp/* CL.
      a958b1a8
  21. Dec 28, 2020
    • Baligh Uddin's avatar
      Adjust visibility rules for migration · 5879a832
      Baligh Uddin authored
      Adjusting visibility to accomodate migration of
      frameworks/opt/net/wifi to packages/modules/Wifi.
      
      BUG: 137323948
      Test: TH
      Change-Id: Ib4c481f6e17507fb5a423be83e04f4cbebfd10f5
      5879a832
  22. Dec 25, 2020
    • Remi NGUYEN VAN's avatar
      Migrate away from AsyncChannel in NetworkAgent · 92f546d4
      Remi NGUYEN VAN authored
      Use two oneway binder interfaces instead.
      The interfaces post messages to handlers as was implemented before, but
      provide a more strictly defined interface, with less hops between
      NetworkAgent, AsyncChannel, and ConnectivityService.
      
      The actual public interface is the NetworkAgent @SystemApi: the binder
      interface is an internal implementation detail.
      
      Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
      Bug: 173574274
      Merged-In: Ie364ab50f416e7821e70f4539a881eea828e1256
      
      Change-Id: Ie364ab50f416e7821e70f4539a881eea828e1256
      92f546d4
  23. Dec 24, 2020
    • Baligh Uddin's avatar
      Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin · 3139f6d1
      Baligh Uddin authored
      Migrate to packages/modules/Wifi.  This CL will be presubmit tested
      once migration is complete.  This CL drops the code from
      frameworks/base/wifi and migrated to packages/modules/Wifi.
      Also adjusts visibility rules in frameworks/base/Android.bp
      Bug: 137323948
      Test: TH
      Merged-In: Id02e28648e922a30d6a81cf92b39eff4ca3cc002
      Change-Id: I28e35cea55001c2333374c2342f496a0340f2f32
      3139f6d1
  24. Dec 23, 2020
    • Baligh Uddin's avatar
      Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin · 6bd6a56b
      Baligh Uddin authored
      Migrate to packages/modules/Wifi.  This CL will be presubmit tested
      once migration is complete.  This CL drops the code from
      frameworks/base/wifi and migrated to packages/modules/Wifi.
      Also adjusts visibility rules in frameworks/base/Android.bp
      Bug: 137323948
      Test: TH
      Merged-In: I9031a37c84e17c2cf5c0552d1b33e8fd59216b92
      
      Change-Id: I4ad80b1584f9f80dffed7786739b80f3aaf88cdc
      6bd6a56b
    • Baligh Uddin's avatar
      Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin · 09fdba42
      Baligh Uddin authored
      Migrate to packages/modules/Wifi.  This CL will be presubmit tested
      once migration is complete.  This CL drops the code from
      frameworks/base/wifi and migrated to packages/modules/Wifi.
      Also adjusts visibility rules in frameworks/base/Android.bp
      Bug: 137323948
      Test: TH
      
      Change-Id: Id02e28648e922a30d6a81cf92b39eff4ca3cc002
      09fdba42
    • Remi NGUYEN VAN's avatar
      Migrate away from AsyncChannel in NetworkAgent · fb9c6e8d
      Remi NGUYEN VAN authored
      Use two oneway binder interfaces instead.
      The interfaces post messages to handlers as was implemented before, but
      provide a more strictly defined interface, with less hops between
      NetworkAgent, AsyncChannel, and ConnectivityService.
      
      The actual public interface is the NetworkAgent @SystemApi: the binder
      interface is an internal implementation detail.
      
      Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
      Change-Id: Ie364ab50f416e7821e70f4539a881eea828e1256
      fb9c6e8d
  25. Dec 22, 2020
  26. Dec 21, 2020
    • Anton Hansson's avatar
      Stop ignoring classes on the classpath for stubs · 121ccbcf
      Anton Hansson authored
      We're working on moving the libcore classes away from srcs and into the
      classpath, and ignoring classes on the classpath will cause incorrect
      API signatures once that happens (several libcore classes appear in
      public API signatures).
      
      Keep the docs building in the same way they were before. They will be
      addressed in separate CLs.
      
      Bug: 173606718
      Test: m checkapi
      Change-Id: I471327c3657662d7a093e9baa2fb6e08d640f895
      121ccbcf
  27. Dec 17, 2020
    • Benedict Wong's avatar
      Implement basic VcnConfig and VcnGatewayConnectionConfig · 26497366
      Benedict Wong authored
      This change adds some of the basic fields in VcnConfig and
      VcnGatewayConnectionConfig, plus adds a persistability layer to ensure
      all VcnConfig(s) are disk-stable.
      
      Bug: 163602123
      Bug: 163594033
      Test: New tests added, passing
      Change-Id: I2e632532809e7768b284be376f2b0a77f634fef5
      26497366
  28. Dec 16, 2020
  29. Dec 10, 2020
  30. Dec 04, 2020
    • Hayden Gomes's avatar
      Adding AudioUsage converters to AudioAttributes · c164f6a4
      Hayden Gomes authored
      audio_policy_configuration.xsd defines strings used by HAL
      to represent audio usages. This adds converters between
      those strings and the AudioAttributes#attributeUsage values
      
      Bug: 171572311
      Test: atest AudioAttributesTest
      Change-Id: I5301276ebd6ea1539182e9925a1e19f515e80597
      Merged-In: I5301276ebd6ea1539182e9925a1e19f515e80597
      c164f6a4
    • Baligh Uddin's avatar
      Migrate frameworks/base/cmds/statsd to packages/modules/StatsD/bin · 3eab1b09
      Baligh Uddin authored
      Add statsd protos to platform_protos rule
      
      BUG: 167962588
      TEST: TH
      TEST: Local build [ m com.android.os.statsd ]
      Merged-In: I053f2a211ea28c2f181937af3d58ad16b235d096
      Change-Id: I637a1af27d572924e88b1f8a930fc45d0794fa20
      3eab1b09
  31. Dec 03, 2020
  32. Nov 26, 2020
  33. Nov 25, 2020
    • Jeffrey Huang's avatar
      Move enums file to new directory · 71ae4fc7
      Jeffrey Huang authored
      Bug: 167962588
      Test: m -j
      Change-Id: I29b21fdc98c6c795902d23f21ef3dfd11d3f3216
      Merged-In: I29b21fdc98c6c795902d23f21ef3dfd11d3f3216
      71ae4fc7
    • Jeffrey Huang's avatar
      Delete atoms.proto from statsd · 15b86108
      Jeffrey Huang authored
      Use the atoms.proto in proto_logging as the source of truth. Also
      migrates statsd log api gen to use the new atoms.proto
      
      Bug: 167962588
      Test: m -j && m CtsStatsdAtomHostTestCases
      
      Change-Id: I36ec354d273dceace5245d7634c68ac63dc5a8cd
      Merged-In: I36ec354d273dceace5245d7634c68ac63dc5a8cd
      15b86108
Loading