Treehugger Robot
83d657df8b
Merge "Adding per-app default network callbacks support" am: b7adcd0e6e am: b9dda055a5 am: 9e4fde43af
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582646
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie34506791d5c44b514e5d0c6167c79f863bd09e2
2021-02-17 05:41:33 +00:00
Treehugger Robot
9e4fde43af
Merge "Adding per-app default network callbacks support" am: b7adcd0e6e am: b9dda055a5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582646
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaaf1ceea1e085f84d4114f99aa582e406dd631ae
2021-02-17 05:23:07 +00:00
Treehugger Robot
b9dda055a5
Merge "Adding per-app default network callbacks support" am: b7adcd0e6e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582646
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6d7132cc0f563b5411583259011b7326f386403e
2021-02-17 05:11:31 +00:00
Treehugger Robot
b7adcd0e6e
Merge "Adding per-app default network callbacks support"
2021-02-17 04:47:51 +00:00
Lorenzo Colitti
5ffeed6200
Merge "Use UserHandles instead of userId integers." am: f2abf2692c am: 883841d201 am: 4ff8cf6391
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589632
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b6bdedc099cb421b52dd35b4ccfdfaf0d9c9633
2021-02-17 02:53:29 +00:00
James Mattis
e494cbb3e2
Adding per-app default network callbacks support
...
Adding support for per-app default network changes to send callbacks
used in registerDefaultNetworkCallback() to those applications that
have the default changed as part of the per-app flow.
Bug: 179819249
Bug: 176494815
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk
Change-Id: Id8ef987cdfbaad497929fea21b38f831c4f9b15b
2021-02-16 18:24:46 -08:00
Lorenzo Colitti
4ff8cf6391
Merge "Use UserHandles instead of userId integers." am: f2abf2692c am: 883841d201
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589632
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5652b8847b094ef009d3ace14948e9122339ed21
2021-02-17 02:20:49 +00:00
Lorenzo Colitti
883841d201
Merge "Use UserHandles instead of userId integers." am: f2abf2692c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589632
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If674b972d4cf28094fc21c37197ec96e94ecdbcb
2021-02-17 01:51:14 +00:00
Lorenzo Colitti
f2abf2692c
Merge "Use UserHandles instead of userId integers."
2021-02-17 01:26:44 +00:00
Treehugger Robot
c911155824
[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011 am: 63c79f8b66 -s ours am: b0623ccf03 -s ours
...
am skip reason: Change-Id I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06 with SHA-1 47bc43a414 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588961
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0dcff72fd2a921e9e781acd5ffbb19a8a6a7c98c
2021-02-16 16:35:39 +00:00
Treehugger Robot
b0623ccf03
[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011 am: 63c79f8b66 -s ours
...
am skip reason: Change-Id I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06 with SHA-1 47bc43a414 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588961
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7396eb4c772714f142c2c1f3831efa533772159b
2021-02-16 15:56:35 +00:00
Treehugger Robot
63c79f8b66
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588961
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0b9d7ed1e439f69ea73015173759c5ca2ee1ac89
2021-02-16 15:16:27 +00:00
Bob Badour
dcc986a036
[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
...
Added SPDX-license-identifier-Apache-2.0 to:
apct-tests/perftests/autofill/Android.bp
apct-tests/perftests/blobstore/Android.bp
apct-tests/perftests/core/Android.bp
apct-tests/perftests/core/apps/overlay/Android.bp
apct-tests/perftests/core/apps/reources_manager/Android.bp
apct-tests/perftests/core/jni/Android.bp
apct-tests/perftests/multiuser/Android.bp
apct-tests/perftests/multiuser/apps/dummyapp/Android.bp
apct-tests/perftests/packagemanager/Android.bp
apct-tests/perftests/packagemanager/apps/query-all/Android.bp
apct-tests/perftests/textclassifier/Android.bp
apct-tests/perftests/utils/Android.bp
apct-tests/perftests/windowmanager/Android.bp
apex/Android.bp
apex/blobstore/framework/Android.bp
apex/blobstore/service/Android.bp
apex/jobscheduler/framework/Android.bp
apex/jobscheduler/service/Android.bp
apex/media/Android.bp
apex/media/aidl/Android.bp
apex/media/framework/Android.bp
cmds/am/Android.bp
cmds/app_process/Android.bp
cmds/appops/Android.bp
cmds/appwidget/Android.bp
cmds/backup/Android.bp
cmds/bmgr/Android.bp
cmds/bootanimation/Android.bp
cmds/bu/Android.bp
cmds/content/Android.bp
cmds/dpm/Android.bp
cmds/hid/Android.bp
cmds/hid/jni/Android.bp
cmds/idmap2/Android.bp
cmds/ime/Android.bp
cmds/incident/Android.bp
cmds/incident_helper/Android.bp
cmds/incidentd/Android.bp
cmds/input/Android.bp
cmds/interrupter/Android.bp
cmds/locksettings/Android.bp
cmds/pm/Android.bp
cmds/requestsync/Android.bp
cmds/screencap/Android.bp
cmds/sm/Android.bp
cmds/svc/Android.bp
cmds/telecom/Android.bp
cmds/uiautomator/Android.bp
cmds/uiautomator/cmds/uiautomator/Android.bp
cmds/uiautomator/instrumentation/Android.bp
cmds/uiautomator/library/Android.bp
cmds/vr/Android.bp
cmds/wm/Android.bp
config/Android.bp
core/java/android/service/wallpaper/Android.bp
core/jni/Android.bp
core/sysprop/Android.bp
core/tests/BroadcastRadioTests/Android.bp
core/tests/ConnectivityManagerTest/Android.bp
core/tests/PackageInstallerSessions/Android.bp
core/tests/PlatformCompatFramework/Android.bp
core/tests/bandwidthtests/Android.bp
core/tests/benchmarks/Android.bp
core/tests/bluetoothtests/Android.bp
core/tests/bugreports/Android.bp
core/tests/coretests/Android.bp
core/tests/coretests/BinderDeathRecipientHelperApp/Android.bp
core/tests/coretests/BinderProxyCountingTestApp/Android.bp
core/tests/coretests/BinderProxyCountingTestService/Android.bp
core/tests/coretests/BstatsTestApp/Android.bp
core/tests/coretests/DisabledTestApp/Android.bp
core/tests/coretests/EnabledTestApp/Android.bp
core/tests/coretests/aidl/Android.bp
core/tests/coretests/apks/Android.bp
core/tests/coretests/apks/install/Android.bp
core/tests/coretests/apks/install_bad_dex/Android.bp
core/tests/coretests/apks/install_complete_package_info/Android.bp
core/tests/coretests/apks/install_decl_perm/Android.bp
core/tests/coretests/apks/install_jni_lib/Android.bp
core/tests/coretests/apks/install_jni_lib_open_from_apk/Android.bp
core/tests/coretests/apks/install_loc_auto/Android.bp
core/tests/coretests/apks/install_loc_internal/Android.bp
core/tests/coretests/apks/install_loc_sdcard/Android.bp
core/tests/coretests/apks/install_loc_unspecified/Android.bp
core/tests/coretests/apks/install_use_perm_good/Android.bp
core/tests/coretests/apks/install_uses_feature/Android.bp
core/tests/coretests/apks/install_verifier_bad/Android.bp
core/tests/coretests/apks/install_verifier_good/Android.bp
core/tests/coretests/apks/keyset/Android.bp
core/tests/coretests/apks/locales/Android.bp
core/tests/coretests/apks/overlay_config/Android.bp
core/tests/coretests/apks/version/Android.bp
core/tests/coretests/apks/version_nosys/Android.bp
core/tests/featureflagtests/Android.bp
core/tests/hdmitests/Android.bp
core/tests/hosttests/test-apps/AutoLocTestApp/Android.bp
core/tests/hosttests/test-apps/AutoLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/AutoLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocPermsFLTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocTestApp/Android.bp
core/tests/hosttests/test-apps/ExternalLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/ExternalLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPerms/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.bp
core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.bp
core/tests/hosttests/test-apps/InternalLocTestApp/Android.bp
core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.bp
core/tests/hosttests/test-apps/NoLocTestApp/Android.bp
core/tests/hosttests/test-apps/NoLocVersionedTestApp_v1/Android.bp
core/tests/hosttests/test-apps/NoLocVersionedTestApp_v2/Android.bp
core/tests/hosttests/test-apps/SharedUid/32/Android.bp
core/tests/hosttests/test-apps/SharedUid/32/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/64/Android.bp
core/tests/hosttests/test-apps/SharedUid/64/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/dual/Android.bp
core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.bp
core/tests/hosttests/test-apps/SharedUid/java_only/Android.bp
core/tests/hosttests/test-apps/SimpleTestApp/Android.bp
core/tests/hosttests/test-apps/UpdateExtToIntLocTestApp_v1_ext/Android.bp
core/tests/hosttests/test-apps/UpdateExtToIntLocTestApp_v2_int/Android.bp
core/tests/hosttests/test-apps/UpdateExternalLocTestApp_v1_ext/Android.bp
core/tests/hosttests/test-apps/UpdateExternalLocTestApp_v2_none/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_Auto/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_External/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_Internal/Android.bp
core/tests/hosttests/test-apps/VersatileTestApp_None/Android.bp
core/tests/mockingcoretests/Android.bp
core/tests/notificationtests/Android.bp
core/tests/overlaytests/device/Android.bp
core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.bp
core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.bp
core/tests/overlaytests/device/test-apps/FrameworkOverlay/Android.bp
core/tests/overlaytests/host/Android.bp
core/tests/overlaytests/remount/Android.bp
core/tests/overlaytests/remount/test-apps/Overlay/Android.bp
core/tests/overlaytests/remount/test-apps/SharedLibrary/Android.bp
core/tests/overlaytests/remount/test-apps/SharedLibraryOverlay/Android.bp
core/tests/overlaytests/remount/test-apps/Target/Android.bp
core/tests/packagemanagertests/Android.bp
core/tests/privacytests/Android.bp
core/tests/screenshothelpertests/Android.bp
core/tests/systemproperties/Android.bp
core/tests/utillib/Android.bp
core/tests/utiltests/Android.bp
core/tests/utiltests/jni/Android.bp
core/tests/uwbtests/Android.bp
core/xsd/Android.bp
core/xsd/vts/Android.bp
data/etc/Android.bp
data/etc/car/Android.bp
data/fonts/Android.bp
data/keyboards/Android.mk
drm/jni/Android.bp
errorprone/Android.bp
graphics/proto/Android.bp
keystore/Android.bp
keystore/tests/Android.bp
libs/WindowManager/Jetpack/Android.bp
libs/WindowManager/Shell/Android.bp
libs/WindowManager/Shell/tests/Android.bp
libs/androidfw/Android.bp
libs/androidfw/fuzz/resourcefile_fuzzer/Android.bp
libs/hostgraphics/Android.bp
libs/incident/Android.bp
libs/input/Android.bp
libs/input/tests/Android.bp
libs/protoutil/Android.bp
libs/services/Android.bp
libs/storage/Android.bp
libs/usb/tests/AccessoryChat/Android.bp
libs/usb/tests/AccessoryChat/accessorychat/Android.bp
location/lib/Android.bp
location/tests/Android.bp
location/tests/locationtests/Android.bp
lowpan/tests/Android.bp
media/Android.bp
media/java/Android.bp
media/java/android/media/tv/tunerresourcemanager/Android.bp
media/jni/Android.bp
media/jni/audioeffect/Android.bp
media/jni/soundpool/Android.bp
media/jni/soundpool/tests/Android.bp
media/lib/remotedisplay/Android.bp
media/lib/signer/Android.bp
media/lib/tvremote/Android.bp
media/lib/tvremote/tests/Android.bp
media/mca/filterfw/Android.bp
media/mca/filterfw/native/Android.bp
media/mca/filterpacks/Android.bp
media/mca/samples/CameraEffectsRecordingSample/Android.bp
media/mca/tests/Android.bp
media/native/midi/Android.bp
media/packages/BluetoothMidiService/Android.bp
media/packages/BluetoothMidiService/tests/unit/Android.bp
media/tests/AudioPolicyTest/Android.bp
media/tests/CameraBrowser/Android.bp
media/tests/EffectsTest/Android.bp
media/tests/MediaDump/Android.bp
media/tests/MediaFrameworkTest/Android.bp
media/tests/MediaRouter/Android.bp
media/tests/MtpTests/Android.bp
media/tests/ScoAudioTest/Android.bp
media/tests/SoundPoolTest/Android.bp
media/tests/TunerTest/Android.bp
media/tests/audiotests/Android.bp
media/tests/players/Android.bp
mime/Android.bp
native/android/Android.bp
native/graphics/jni/Android.bp
native/webview/loader/Android.bp
nfc-extras/Android.bp
nfc-extras/tests/Android.bp
packages/AppPredictionLib/Android.bp
packages/BackupEncryption/Android.bp
packages/BackupEncryption/test/robolectric-integration/Android.bp
packages/BackupEncryption/test/robolectric/Android.bp
packages/BackupEncryption/test/unittest/Android.bp
packages/BackupRestoreConfirmation/Android.bp
packages/CarSystemUI/Android.bp
packages/CarrierDefaultApp/Android.bp
packages/CarrierDefaultApp/tests/unit/Android.bp
packages/CompanionDeviceManager/Android.bp
packages/Connectivity/framework/Android.bp
packages/Connectivity/service/Android.bp
packages/CtsShim/Android.bp
packages/CtsShim/build/Android.bp
packages/CtsShim/build/jni/Android.bp
packages/DynamicSystemInstallationService/Android.bp
packages/DynamicSystemInstallationService/tests/Android.bp
packages/EasterEgg/Android.bp
packages/EncryptedLocalTransport/Android.bp
packages/ExtShared/Android.bp
packages/ExternalStorageProvider/Android.bp
packages/ExternalStorageProvider/tests/Android.bp
packages/FakeOemFeatures/Android.bp
packages/FusedLocation/Android.bp
packages/InputDevices/Android.bp
packages/LocalTransport/Android.bp
packages/PackageInstaller/Android.bp
packages/PrintRecommendationService/Android.bp
packages/PrintSpooler/Android.bp
packages/PrintSpooler/jni/Android.bp
packages/PrintSpooler/tests/outofprocess/Android.bp
packages/SettingsLib/ActionBarShadow/Android.bp
packages/SettingsLib/ActionButtonsPreference/Android.bp
packages/SettingsLib/AdaptiveIcon/Android.bp
packages/SettingsLib/Android.bp
packages/SettingsLib/AppPreference/Android.bp
packages/SettingsLib/BarChartPreference/Android.bp
packages/SettingsLib/DisplayDensityUtils/Android.bp
packages/SettingsLib/EntityHeaderWidgets/Android.bp
packages/SettingsLib/HelpUtils/Android.bp
packages/SettingsLib/LayoutPreference/Android.bp
packages/SettingsLib/ProgressBar/Android.bp
packages/SettingsLib/RadioButtonPreference/Android.bp
packages/SettingsLib/RestrictedLockUtils/Android.bp
packages/SettingsLib/SchedulesProvider/Android.bp
packages/SettingsLib/SearchProvider/Android.bp
packages/SettingsLib/SearchWidget/Android.bp
packages/SettingsLib/SettingsSpinner/Android.bp
packages/SettingsLib/SettingsTheme/Android.bp
packages/SettingsLib/Tile/Android.bp
packages/SettingsLib/Utils/Android.bp
packages/SettingsLib/search/Android.bp
packages/SettingsLib/tests/integ/Android.bp
packages/SettingsLib/tests/robotests/Android.bp
packages/SettingsProvider/Android.bp
packages/SharedStorageBackup/Android.bp
packages/Shell/Android.bp
packages/Shell/tests/Android.bp
packages/SimAppDialog/Android.bp
packages/SoundPicker/Android.bp
packages/StatementService/Android.bp
packages/SystemUI/Android.bp
packages/SystemUI/plugin/Android.bp
packages/SystemUI/plugin/ExamplePlugin/Android.bp
packages/SystemUI/plugin_core/Android.bp
packages/SystemUI/shared/Android.bp
packages/VpnDialogs/Android.bp
packages/WAPPushManager/Android.bp
packages/WAPPushManager/tests/Android.bp
packages/WallpaperBackup/Android.bp
packages/WallpaperCropper/Android.bp
packages/overlays/Android.mk
packages/overlays/tests/Android.bp
packages/services/PacProcessor/Android.bp
packages/services/PacProcessor/jni/Android.bp
packages/services/Proxy/Android.bp
proto/Android.bp
rs/jni/Android.mk
samples/demo/haptic-assessment/Android.bp
sax/tests/saxtests/Android.bp
services/Android.bp
services/accessibility/Android.bp
services/appprediction/Android.bp
services/appwidget/Android.bp
services/autofill/Android.bp
services/backup/Android.bp
services/backup/backuplib/Android.bp
services/companion/Android.bp
services/contentcapture/Android.bp
services/contentsuggestions/Android.bp
services/core/Android.bp
services/core/java/com/android/server/vcn/Android.bp
services/core/jni/Android.bp
services/core/xsd/Android.bp
services/core/xsd/vts/Android.bp
services/coverage/Android.bp
services/devicepolicy/Android.bp
services/incremental/Android.bp
services/midi/Android.bp
services/net/Android.bp
services/people/Android.bp
services/print/Android.bp
services/profcollect/Android.bp
services/restrictions/Android.bp
services/robotests/Android.bp
services/robotests/backup/Android.bp
services/systemcaptions/Android.bp
services/tests/PackageManagerComponentOverrideTests/Android.bp
services/tests/PackageManagerServiceTests/host/Android.bp
services/tests/PackageManagerServiceTests/host/test-apps/Android.bp
services/tests/mockingservicestests/Android.bp
services/tests/rescueparty/Android.bp
services/tests/servicestests/Android.bp
services/tests/servicestests/aidl/Android.bp
services/tests/servicestests/apks/Android.bp
services/tests/servicestests/apks/install-split-base/Android.bp
services/tests/servicestests/apks/install-split-feature-a/Android.bp
services/tests/servicestests/apks/install_intent_filters/Android.bp
services/tests/servicestests/apks/install_uses_sdk/Android.bp
services/tests/servicestests/test-apps/ConnTestApp/Android.bp
services/tests/servicestests/test-apps/JobTestApp/Android.bp
services/tests/servicestests/test-apps/PackageParserApp/Android.bp
services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
services/tests/servicestests/test-apps/SimpleServiceTestApp/Android.bp
services/tests/servicestests/test-apps/SuspendTestApp/Android.bp
services/tests/shortcutmanagerutils/Android.bp
services/tests/uiservicestests/Android.bp
services/tests/wmtests/Android.bp
services/usage/Android.bp
services/usb/Android.bp
services/voiceinteraction/Android.bp
services/wifi/Android.bp
startop/apps/test/Android.bp
startop/iorap/Android.bp
startop/iorap/functional_tests/Android.bp
startop/iorap/stress/Android.bp
startop/iorap/tests/Android.bp
startop/view_compiler/Android.bp
startop/view_compiler/dex_builder_test/Android.bp
test-base/hiddenapi/Android.bp
test-mock/Android.bp
test-runner/tests/Android.bp
tests/AccessibilityEventsLogger/Android.bp
tests/AccessoryDisplay/common/Android.bp
tests/AccessoryDisplay/sink/Android.bp
tests/AccessoryDisplay/source/Android.bp
tests/ActivityManagerPerfTests/stub-app/Android.bp
tests/ActivityManagerPerfTests/test-app/Android.bp
tests/ActivityManagerPerfTests/tests/Android.bp
tests/ActivityManagerPerfTests/utils/Android.bp
tests/ActivityTests/Android.bp
tests/ActivityViewTest/Android.bp
tests/AmSlam/Android.bp
tests/ApkVerityTest/Android.bp
tests/ApkVerityTest/ApkVerityTestApp/Android.bp
tests/ApkVerityTest/block_device_writer/Android.bp
tests/AppLaunch/Android.bp
tests/AppLaunchWear/Android.bp
tests/AppResourcesLoaders/Android.bp
tests/AppResourcesLoaders/Overlay/Android.bp
tests/Assist/Android.bp
tests/AutoVerify/app1/Android.bp
tests/AutoVerify/app2/Android.bp
tests/AutoVerify/app3/Android.bp
tests/AutoVerify/app4/Android.bp
tests/BackgroundDexOptServiceIntegrationTests/Android.bp
tests/BandwidthTests/Android.bp
tests/BatteryWaster/Android.bp
tests/BiDiTests/Android.bp
tests/BlobStoreTestUtils/Android.bp
tests/BootImageProfileTest/Android.bp
tests/BrowserPowerTest/Android.bp
tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp
tests/CameraPrewarmTest/Android.bp
tests/Codegen/Android.bp
tests/Compatibility/Android.bp
tests/CoreTests/android/Android.bp
tests/DataIdleTest/Android.bp
tests/DozeTest/Android.bp
tests/DpiTest/Android.bp
tests/DynamicCodeLoggerIntegrationTests/Android.mk
tests/FeatureSplit/base/Android.bp
tests/FeatureSplit/feature1/Android.bp
tests/FeatureSplit/feature2/Android.bp
tests/FixVibrateSetting/Android.bp
tests/FlickerTests/Android.bp
tests/FlickerTests/test-apps/Android.bp
tests/FlickerTests/test-apps/flickerapp/Android.bp
tests/FrameworkPerf/Android.bp
tests/GamePerformance/Android.bp
tests/GridLayoutTest/Android.bp
tests/HierarchyViewerTest/Android.bp
tests/HugeBackup/Android.bp
tests/HwAccelerationTest/Android.bp
tests/Internal/Android.bp
tests/JankBench/Android.bp
tests/JobSchedulerPerfTests/Android.bp
tests/JobSchedulerTestApp/Android.bp
tests/LargeAssetTest/Android.bp
tests/LegacyAssistant/Android.bp
tests/LocalizationTest/Android.bp
tests/LocationTracker/Android.bp
tests/LotsOfApps/Android.bp
tests/LowStorageTest/Android.bp
tests/ManagedProfileLifecycleStressTest/Android.bp
tests/ManagedProfileLifecycleStressTest/app/DummyDPC/Android.bp
tests/MemoryUsage/Android.bp
tests/MirrorSurfaceTest/Android.bp
tests/NativeProcessesMemoryTest/Android.bp
tests/NetworkSecurityConfigTest/Android.bp
tests/NullHomeTest/Android.bp
tests/OdmApps/Android.bp
tests/OdmApps/app/Android.bp
tests/OdmApps/priv-app/Android.bp
tests/OneMedia/Android.bp
tests/PackageWatchdog/Android.bp
tests/PlatformCompatGating/Android.bp
tests/PlatformCompatGating/test-rules/Android.bp
tests/ProtoInputStreamTests/Android.bp
tests/RemoteDisplayProvider/Android.bp
tests/RenderThreadTest/Android.bp
tests/RollbackTest/Android.bp
tests/SerialChat/Android.bp
tests/ServiceCrashTest/Android.bp
tests/SharedLibrary/client/Android.bp
tests/SharedLibrary/lib/Android.bp
tests/ShowWhenLockedApp/Android.bp
tests/SmokeTest/Android.bp
tests/SmokeTest/tests/Android.bp
tests/SmokeTestApps/Android.bp
tests/SoundTriggerTestApp/Android.bp
tests/Split/Android.bp
tests/StagedInstallTest/Android.bp
tests/StatusBar/Android.bp
tests/SurfaceComposition/Android.bp
tests/SurfaceControlViewHostTest/Android.bp
tests/SystemMemoryTest/device/Android.bp
tests/SystemMemoryTest/host/Android.bp
tests/SystemUIDemoModeController/Android.bp
tests/TaskOrganizerTest/Android.bp
tests/TelephonyCommonTests/Android.bp
tests/TouchLatency/Android.bp
tests/TransformTest/Android.bp
tests/TtsTests/Android.bp
tests/UiBench/Android.bp
tests/UsageReportingTest/Android.bp
tests/UsageStatsPerfTests/Android.bp
tests/UsageStatsTest/Android.bp
tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.bp
tests/UsbHostExternalManagmentTest/AoapTestHost/Android.bp
tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.bp
tests/UsbManagerTests/Android.bp
tests/UsbManagerTests/lib/Android.bp
tests/UsbTests/Android.bp
tests/UsesFeature2Test/Android.bp
tests/VectorDrawableTest/Android.bp
tests/VoiceEnrollment/Android.bp
tests/VoiceInteraction/Android.bp
tests/WallpaperTest/Android.bp
tests/WindowAnimationJank/Android.bp
tests/WindowInsetsTests/Android.bp
tests/appwidgets/AppWidgetHostTest/Android.bp
tests/appwidgets/AppWidgetProviderTest/Android.bp
tests/backup/Android.mk
tests/benchmarks/Android.bp
tests/libs-permissions/Android.bp
tests/net/Android.bp
tests/net/common/Android.bp
tests/net/deflake/Android.bp
tests/net/integration/Android.bp
tests/net/jni/Android.bp
tests/net/smoketest/Android.bp
tests/notification/Android.bp
tests/permission/Android.bp
tests/privapp-permissions/Android.bp
tests/testables/Android.bp
tests/testables/tests/Android.bp
tests/utils/StubIME/Android.bp
tests/utils/hostutils/Android.bp
tests/utils/testutils/Android.bp
tests/vcn/Android.bp
tools/aapt/Android.bp
tools/aapt2/Android.bp
tools/aapt2/integration-tests/AutoVersionTest/Android.bp
tools/aapt2/integration-tests/BasicTest/Android.bp
tools/aapt2/integration-tests/MergeOnlyTest/LeafLib/Android.mk
tools/aapt2/integration-tests/MergeOnlyTest/LocalLib/Android.mk
tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk
tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk
tools/aapt2/integration-tests/StaticLibTest/App/Android.bp
tools/aapt2/integration-tests/StaticLibTest/LibOne/Android.bp
tools/aapt2/integration-tests/StaticLibTest/LibTwo/Android.bp
tools/aapt2/integration-tests/SymlinkTest/Android.bp
tools/bit/Android.bp
tools/codegen/Android.bp
tools/dump-coverage/Android.bp
tools/incident_report/Android.bp
tools/incident_section_gen/Android.bp
tools/lock_agent/Android.bp
tools/locked_region_code_injection/Android.bp
tools/obbtool/Android.bp
tools/powermodel/Android.bp
tools/preload-check/Android.bp
tools/preload-check/device/Android.bp
tools/preload/loadclass/Android.bp
tools/processors/staledataclass/Android.bp
tools/processors/view_inspector/Android.bp
tools/protologtool/Android.bp
tools/sdkparcelables/Android.bp
tools/split-select/Android.bp
tools/streaming_proto/Android.bp
tools/validatekeymaps/Android.bp
wifi/java/Android.bp
wifi/tests/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
libs/hwui/Android.bp
native/webview/plat_support/Android.bp
obex/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
SPDX-license-identifier-CC-BY SPDX-license-identifier-CPL-1.0
SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
SPDX-license-identifier-W3C legacy_unencumbered
to:
Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
legacy_unencumbered
to:
core/java/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CPL-1.0
to:
test-base/Android.bp
test-runner/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL
to:
core/res/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0
to:
libs/usb/Android.bp
libs/usb/tests/accessorytest/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
to:
tools/preload/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
SPDX-license-identifier-Unicode-DFS
to:
api/Android.bp
boot/Android.bp
cmds/device_config/Android.bp
cmds/settings/Android.bp
core/api/Android.bp
core/tests/coretests/certs/Android.bp
core/tests/overlaytests/remount/test-apps/certs/Android.bp
core/tests/overlaytests/remount/test-apps/overlaid_apex/Android.bp
core/tests/overlaytests/remount/test-apps/overlay_apex/Android.bp
libs/tracingproxy/Android.bp
services/startop/Android.bp
test-legacy/Android.mk
tests/ApkVerityTest/testdata/Android.bp
tests/TransitionTests/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: Ic44d662936d1ff0cae7fbe915932b37aa4e4869a
Merged-in: I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06
2021-02-16 04:09:57 -08:00
Lorenzo Colitti
0e9d2108b0
Use UserHandles instead of userId integers.
...
userId integers are not public API and code should use UserHandle
instead.
Bug: 170598012
Test: passes existing tests
Change-Id: Ic27b93ccfe6bbc97e7419293ce165fee6cd51e6d
2021-02-16 08:06:23 +00:00
Frank Li
86becab99c
Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: 5f2492095f am: a53e22a3e4 am: 20600a280e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563495
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia2b32d56b4a00608b226c1d9b87b4e5b7818bd86
2021-02-16 04:13:05 +00:00
Frank Li
20600a280e
Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: 5f2492095f am: a53e22a3e4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563495
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib6d8d56a79bd7f8751c3604a292f2bb8c34fd765
2021-02-16 03:42:49 +00:00
Frank Li
a53e22a3e4
Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: 5f2492095f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563495
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I92df8ef58e30ddefb84001a0b45363e82fdd3621
2021-02-16 03:08:00 +00:00
Lorenzo Colitti
601ccc3c52
Merge "Move the VPN code out of packages/Connectivity." am: 125297acbf am: a4bb1e5c84 am: 8ff1082757
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589331
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0acb8b9e93f839986aa6580832f1cdab12b3baf2
2021-02-16 02:24:39 +00:00
Lorenzo Colitti
b06b6d5401
[automerger skipped] Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: deae737952 am: 69f3b6bd3c am: 8637acec9d -s ours
...
am skip reason: Change-Id Id02a37624655c4ff88744c9c57af9f2a17953667 with SHA-1 ab9f06ebe0 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580383
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I514aaf1a583bfd76d5bc32e14d1bc0f684131c51
2021-02-16 02:24:09 +00:00
Remi NGUYEN VAN
2766d615e6
Merge "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."" am: 75049d8ec8 am: 0ee35089b7 am: 96f21fd65f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585569
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I88648d8cab6081c178ecdd3b38935658a78b78dc
2021-02-16 02:23:51 +00:00
lifr
08b7560748
[CS01]Remove hidden API usage of NetworkCapabilities
...
The connection service will become the mainline module. The mutable
NetworkCapabilities is deprecated, and the NetworkCapabilities should
be built through their Builder instead.
Bug: 170598012
Test: atest FrameworksNetTests
Test: atest IpConnectivityMetricsTest
Change-Id: I73a4d3a7c118b9cef037ed52efb96ed123da2fa5
2021-02-15 17:35:06 +00:00
Lorenzo Colitti
8ff1082757
Merge "Move the VPN code out of packages/Connectivity." am: 125297acbf am: a4bb1e5c84
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589331
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia6c73f67cc7e81025d8c55a437ada9ba4fce34ca
2021-02-15 12:34:47 +00:00
Lorenzo Colitti
8637acec9d
Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: deae737952 am: 69f3b6bd3c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580383
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2a6a2442a6dffe85c6d9f4783438b4a07865fd05
2021-02-15 12:34:36 +00:00
Lorenzo Colitti
a4bb1e5c84
Merge "Move the VPN code out of packages/Connectivity." am: 125297acbf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589331
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I44cf61bec31d83217ca836aa387030818cd226cb
2021-02-15 12:25:42 +00:00
Lorenzo Colitti
69f3b6bd3c
Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: deae737952
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580383
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1aca516555b1aea484aa962d1f538b3ae0eb9d4d
2021-02-15 12:21:40 +00:00
Remi NGUYEN VAN
96f21fd65f
Merge "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."" am: 75049d8ec8 am: 0ee35089b7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585569
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I12c2fe14714d283e550234a1f05e386ccf6c8fbf
2021-02-15 12:20:32 +00:00
Lorenzo Colitti
9cdb79d634
Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." am: b3ce8c39d8 am: 3d2c5d6774 am: 11eae148c4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5d38e78800c9a524ae7ccf5d55ebae1a9f60922f
2021-02-15 12:08:03 +00:00
Lorenzo Colitti
125297acbf
Merge "Move the VPN code out of packages/Connectivity."
2021-02-15 12:05:48 +00:00
Lorenzo Colitti
1a56171616
Move the VPN code out of packages/Connectivity.
...
Bug: 173331190
Test: atest FrameworksNetTests HostsideVpnTests CtsNetTestCases
Change-Id: Idc6ed1a544e744f8661d1e387da278736d407489
2021-02-15 12:05:40 +00:00
Lorenzo Colitti
deae737952
Merge "Rename getVpnLockdownWhitelist to -Allowlist"
2021-02-15 12:04:24 +00:00
Lorenzo Colitti
6cb08ce6d0
Rename getVpnLockdownWhitelist to -Allowlist
...
Test: m
Change-Id: Id02a37624655c4ff88744c9c57af9f2a17953667
Merged-In: Id02a37624655c4ff88744c9c57af9f2a17953667
2021-02-15 12:04:13 +00:00
Remi NGUYEN VAN
0ee35089b7
Merge "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."" am: 75049d8ec8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585569
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib6e86d3195bff6fca762ecf057437f481fcbc884
2021-02-15 11:51:59 +00:00
Remi NGUYEN VAN
75049d8ec8
Merge "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu...""
2021-02-15 11:39:25 +00:00
Lorenzo Colitti
11eae148c4
Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." am: b3ce8c39d8 am: 3d2c5d6774
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib20cb0ce6e981f71695edee77e428b4926266ea7
2021-02-15 11:35:27 +00:00
Lorenzo Colitti
3d2c5d6774
Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." am: b3ce8c39d8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81793b6c6ff3e4eb4146a115079443f76eecba13
2021-02-15 11:00:37 +00:00
Lorenzo Colitti
b3ce8c39d8
Merge "BroadcastInterceptingContext: use passed-in broadcast Handler."
2021-02-15 10:42:18 +00:00
Lorenzo Colitti
37d17e60c3
BroadcastInterceptingContext: use passed-in broadcast Handler.
...
Currently, BroadcastInterceptingContext always runs broadcast
receivers on the thread that called sendBroadcast. This means:
1. Receivers might run on the wrong thread, making the test less
realistic.
2. If any receiver checks what thread it's running on, then
either the check needs to be modified or deleted, or the test
must call sendBroadcast on the thread that the receiver
expects to run on. The latter is impossible when there is more
than one receiver that needs to run on more than one thread.
This CL adds a setUseRegisteredHandlers method that allows tests
to say that they want each receiver to run on the Handler
specified at registration time.
This CL also enables the new mode for ConnectivityServiceTest,
and resolves a TODO to re-enable a disabled thread check.
The new mode cannot be enabled by default because it would break
most of the tests.
All the below tests pass except for the car bluetooth test
testAutoConnectAdapterOff_returnsImmediately which was already failing.
Bug: 173331190
Test: atest CarInputServiceTest BluetoothProfileDeviceManagerTest
Test: atest NetworkPolicyManagerServiceTest
Test: atest ConnectivityServiceTest
Test: atest TetheringTest TetheringNotificationUpdaterTest
Test: atest VersionedBroadcastListenerTest EntitlementManagerTest
Test: atest TetheringConfigurationTest
Test: atest CachedDeviceStateServiceTest
Test: atest EmergencyAffordanceServiceTest
Change-Id: I3303bb14516f07a55d82a16b59c111ab3f8b0389
2021-02-15 10:40:32 +00:00
TreeHugger Robot
d0ecb8397f
Merge "Rename getVpnLockdownWhitelist to -Allowlist" into sc-dev
2021-02-15 08:29:55 +00:00
Lorenzo Colitti
aad5bc244b
Merge "Minor fixes to LockdownVpnTracker." am: 63072f5113 am: 3926e61925 am: ca49f2e37c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585566
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id3571722156aaaa6c04b812e58dd011f37029cdb
2021-02-15 08:12:27 +00:00
Lorenzo Colitti
ca49f2e37c
Merge "Minor fixes to LockdownVpnTracker." am: 63072f5113 am: 3926e61925
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585566
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9cfdfe54af4ff25e6ca8aee8ddccc74882a72f71
2021-02-15 07:38:20 +00:00
Lorenzo Colitti
ab9f06ebe0
Rename getVpnLockdownWhitelist to -Allowlist
...
Test: m
Bug: 173331190
Change-Id: Id02a37624655c4ff88744c9c57af9f2a17953667
2021-02-15 16:10:14 +09:00
Lorenzo Colitti
3926e61925
Merge "Minor fixes to LockdownVpnTracker." am: 63072f5113
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585566
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib400714e6faa8cf06487c5d6c721fdd444164fa4
2021-02-15 06:58:45 +00:00
Lorenzo Colitti
63072f5113
Merge "Minor fixes to LockdownVpnTracker."
2021-02-15 06:25:16 +00:00
Treehugger Robot
22786143a4
Merge "Expose VpnTransportInfo as module-lib API." am: 30f9755ffc am: 73d58fb722 am: aeba5e6808
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585572
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I71abed2260e6b57a96132c1e978f499809ce98cc
2021-02-15 06:24:53 +00:00
Treehugger Robot
aeba5e6808
Merge "Expose VpnTransportInfo as module-lib API." am: 30f9755ffc am: 73d58fb722
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585572
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5c86cd1089bd4fe406fadf2e0ab6609558ed8510
2021-02-15 05:51:10 +00:00
Treehugger Robot
73d58fb722
Merge "Expose VpnTransportInfo as module-lib API." am: 30f9755ffc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585572
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I746f6c33ae1076aa057eca1c731847bf59b7ba66
2021-02-15 05:24:28 +00:00
Treehugger Robot
30f9755ffc
Merge "Expose VpnTransportInfo as module-lib API."
2021-02-15 04:54:13 +00:00
Lorenzo Colitti
f22aa33bc6
Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: 6e423b8024 am: f390bd61d7 am: 321e1c1f6a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581293
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I698b6b082b121c004b2c8b05ef423da1bd8b871b
2021-02-15 01:32:50 +00:00
Lorenzo Colitti
321e1c1f6a
Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: 6e423b8024 am: f390bd61d7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581293
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91816c01a799a89b89098a6e9ff256dae7d31dbf
2021-02-15 01:03:06 +00:00
Lorenzo Colitti
a0473fccb7
Minor fixes to LockdownVpnTracker.
...
1. Remove the legacy network type. This is only used for logging.
- Replace the logcat logging with the display transport
- Remove the EventLogTags logging, since it's likely not
actually used by anyone.
2. Remove code that checks for NetworkInfo objects in state
FAILED, since LockdownVpnTracker can never have received any
such NetworkInfo from ConnectivityService since lollipop.
Bug: 173331190
Test: passes existing tests in ConnectivityServiceTest
Change-Id: I66ed71e51ba18b95862f3a0a5df2775eecea501e
2021-02-15 09:58:20 +09:00