Skip to content
Snippets Groups Projects
  1. Feb 18, 2021
  2. Feb 17, 2021
    • Rubin Xu's avatar
      Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c7 am: 5bddee5d · 7e3ab781
      Rubin Xu authored
      Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571063
      
      MUST ONLY BE SUBMITTED BY AUTOMERGER
      
      Change-Id: I7967cc8c972f5d141ba83a7e2cb882ddb529c663
      7e3ab781
    • Rubin Xu's avatar
      Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c7 · 5bddee5d
      Rubin Xu authored
      Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571063
      
      MUST ONLY BE SUBMITTED BY AUTOMERGER
      
      Change-Id: Ib3e32e5e7fdc894bf2ce92fe955c92207e4d0fb4
      5bddee5d
    • Rubin Xu's avatar
      5eeae4c7
    • Cody Kesting's avatar
      Correct comment for safe mode alarm in VcnGatewayConnection. · b79add45
      Cody Kesting authored
      Bug: 178140973
      Test: atest FrameworksVcnTests
      Change-Id: I0cadd145fe41f5589fb79725a4370aed527927a0
      b79add45
    • Cody Kesting's avatar
      Implement VCN error callback use. · a65c2d8a
      Cody Kesting authored
      This CL updates VcnGatewayConnection to notify VcnManagementService
      (through Vcn) when errors occur with a gateway. VcnManagementService
      then notifies registered, permissioned VcnStatusCallbacks via
      
      Bug: 163433613
      Test: atest FrameworksVcnTests
      Change-Id: I3be3cac4b591b19a0b0075767fde0ba2eb6e12a2
      a65c2d8a
    • 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
    • Yan Yan's avatar
      Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" am: bf8113b9 am: 8f2b5071 · 559fd17e
      Yan Yan authored
      Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554684
      
      MUST ONLY BE SUBMITTED BY AUTOMERGER
      
      Change-Id: I3d0999c36c05c3bd8e0f6e561cb50cc018936189
      559fd17e
    • Hunter Knepshield's avatar
      Merge "Allow optional package names in carrier configs" am: 68612ac5 am: c47df2e2 · 7c7bb0cb
      Hunter Knepshield authored
      Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563677
      
      MUST ONLY BE SUBMITTED BY AUTOMERGER
      
      Change-Id: Ia937988ef040a85a028ec45d69fad3f291860904
      7c7bb0cb
    • Yan Yan's avatar
      Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" am: a931d451 am: 14e64c42 · e0610fe1
      Yan Yan authored
      Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553154
      
      MUST ONLY BE SUBMITTED BY AUTOMERGER
      
      Change-Id: Ie04f68e463251668d27d636c77dcd39558125ffb
      e0610fe1
    • Treehugger Robot's avatar
      Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e40 am: 4b06a33f · 94e09fbe
      Treehugger Robot authored
      Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587772
      
      MUST ONLY BE SUBMITTED BY AUTOMERGER
      
      Change-Id: If5333980d2af4d3d703fc7bbf1545214697c9841
      94e09fbe
    • Brad Ebinger's avatar
      Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am:... · abfa62f8
      Brad Ebinger authored
      Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa486 am: cd59a1a0
      
      Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574863
      
      MUST ONLY BE SUBMITTED BY AUTOMERGER
      
      Change-Id: Iddf0a66cee2204f7eeb50ea8ce6fe38f2a93b44b
      abfa62f8
    • 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
    • Yan Yan's avatar
      Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" am: bf8113b9 · 8f2b5071
      Yan Yan authored
      Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554684
      
      MUST ONLY BE SUBMITTED BY AUTOMERGER
      
      Change-Id: I1fedfbd2270ff5dac3e87e1ed83b0607a4ad2c30
      8f2b5071
    • Yan Yan's avatar
    • Hunter Knepshield's avatar
      Merge "Allow optional package names in carrier configs" am: 68612ac5 · c47df2e2
      Hunter Knepshield authored
      Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563677
      
      MUST ONLY BE SUBMITTED BY AUTOMERGER
      
      Change-Id: I11323dffc28c43e9463bd9f0cbcc04fad29f7a6a
      c47df2e2
    • Yan Yan's avatar
      Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" am: a931d451 · 14e64c42
      Yan Yan authored
      Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553154
      
      MUST ONLY BE SUBMITTED BY AUTOMERGER
      
      Change-Id: I2cda370ffe8babd62d8b7f38a09e35dd947c3384
      14e64c42
    • Treehugger Robot's avatar
      Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e40 · 4b06a33f
      Treehugger Robot authored
      Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587772
      
      MUST ONLY BE SUBMITTED BY AUTOMERGER
      
      Change-Id: I3d8da5f999b75a05ce45d2d2fe31e5e0fa0b792f
      4b06a33f
    • Brad Ebinger's avatar
      Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa486 · cd59a1a0
      Brad Ebinger authored
      Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574863
      
      MUST ONLY BE SUBMITTED BY AUTOMERGER
      
      Change-Id: I416fd516d93bd0505e3764fc607a2f5f13c3173e
      cd59a1a0
    • Hunter Knepshield's avatar
Loading