summaryrefslogtreecommitdiff
path: root/services/devicepolicy
AgeCommit message (Collapse)Author
2021-03-16Change the parameter type from ContentResolver to Contextlucaslin
Context is more useful than ContentResolver, it can provide more information if we want to change the behavior in the future. Bug: 172183305 Test: atest FrameworksNetTests Change-Id: I5702c7d74b862a76558b94f1abe2c6df9eb7f097 Merged-In: I5702c7d74b862a76558b94f1abe2c6df9eb7f097
2021-03-12Have a new API to get private DNS modelucaslin
- Expose PRIVATE_DNS_MODE_OFF, PRIVATE_DNS_MODE_OPPORTUNISTIC and PRIVATE_DNS_MODE_PROVIDER_HOSTNAME for external users. - Since PRIVATE_DNS_DEFAULT_MODE_FALLBACK might be changed from release to release, so it cannot be exposed as a system API. Remove PRIVATE_DNS_DEFAULT_MODE_FALLBACK and have a new API - getPrivateDnsMode() for users to get the private DNS mode instead. Bug: 172183305 Test: atest FrameworksNetTests CtsNetTestCases Change-Id: I02a1e91b4eafb5f5df3eada1c07b99849a050c3c Merged-In: I02a1e91b4eafb5f5df3eada1c07b99849a050c3c
2021-02-24Merge "Keystore 2.0: Remove attestKey from KeyChain." am: eb45aabc03Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559810 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1a9df17baef8fa083673a2bb2b117fd112f209a4
2021-02-23Keystore 2.0: Remove attestKey from KeyChain.Janis Danisevskis
KeyChain supports device id attestation through KeyGenParameterSpec now. No need to call attest key individually. Also calling attest key individually is no longer supported by Keystore 2.0 and KeyMint. Also isBoundKeyAlgorithm returns true. Test: atest FrameworksServicesTests:DevicePolicyManagerTest Bug: 171305387 Merged-In: I759fe245b48fe435153fded2c74c9ae99634c146 Change-Id: I759fe245b48fe435153fded2c74c9ae99634c146
2021-02-21Merge ab/7061308 into stage.Xin Li
Bug: 180401296 Merged-In: I4bf82035631ccff6d5a6144d6d9b1d203b076851 Change-Id: I1b5f3a672a55eaabba0f5389bab110b395553559
2021-02-18Stop using ConnectivityManager for VPNs in DPMS.Lorenzo Colitti
These methods have all moved to VpnManager. Test: m Bug: 173331190 Change-Id: I46d9a7768546139690154b1ee1e1bf716b3a2c17 Merged-In: I46d9a7768546139690154b1ee1e1bf716b3a2c17
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to frameworks/baseBob Badour
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-15Rename getVpnLockdownWhitelist to -AllowlistLorenzo Colitti
Test: m Change-Id: Id02a37624655c4ff88744c9c57af9f2a17953667 Merged-In: Id02a37624655c4ff88744c9c57af9f2a17953667
2020-12-25Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: 5565118666Serik Beketayev
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d
2020-12-23[Mainline] Migrate ProxyInfoSerik Beketayev
Bug: 173455434 Test: atest FrameworksNetTests Change-Id: I924aed710b62a0c91b888a9e04ac2c90cdfd88d0
2020-12-23Merge "Split NetworkUtils and NetworkUtilsInternal" am: 3ed4fd3a89 am: ↵Remi NGUYEN VAN
635d60201d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513140 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7b2eae7f9988ae8fa8c858709cafc17c1420f4b7
2020-12-23Merge "Split NetworkUtils and NetworkUtilsInternal"Remi NGUYEN VAN
2020-12-17DO NOT MERGE Correctly reset cross-profile app-op am: f764d9e98fAlex Kershaw
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13236705 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iea45f7508d51a3a2f2a7be513549b2d8d34e1bb9
2020-12-17DO NOT MERGE Correctly reset cross-profile app-opAlex Kershaw
Delegate the resetting of the INTERACT_ACROSS_PROFILES app-op to DevicePolicyManager, which knows whether it should be pre-granted and knows to apply it equally across all users in the profile group. Further unit tests for DevicePolicyManagerInternal will be added in b/175440570 when we have the better infra for that. The CrossProfileAppsServiceImpl changes look more complex than they are. They consist of the following: - Inclusive language changes to 'allowlist' - Static imports of permissions to improve readability - Previously, the setInteractAcrossProfilesAppOp method would set the app-op for every user within the profile group of the 'calling user'. However, given that we are now exposing this as a server-side internal API where we need to pass in a user ID (from AppOpsService), we don't necessarily have the guarantee that the 'calling user' is in the same profile group. So we split it up: the client-side API and AIDL API still set the app-op for the calling profile group, whereas the internal API sets the app-op for every user within the profile group of the provided user. The changes simply abstract away references to the 'calling user ID'. Fixes: 166561076 Bug: 175440570 Test: atest services/robotests/src/com/android/server/pm/CrossProfileAppsServiceImplRoboTest.java --verbose -c Test: manual Change-Id: I2181fe66022aaf6c3e6d784c0569d2f41ab66537 (cherry picked from commit d004f41188ba39afd2c75e4e7dede6b755a9d752)
2020-12-11Fix DevicePolicyManager.isBackupServiceEnabled() breakage.Tobias Thierer
http://ag/12885739 introduced a enforceCallingPermission(BACKUP) check but callers of this API do not hold that permission. This CL fixes this by changing the check to enforceCallingOrSelfPermission(BACKUP), and clearing the binder identity in DevicePolicyManagerService, which makes the system server process the owner of that call. Bug: 158482162 Bug: 172466964 Test: atest com.android.cts.devicepolicy.{Device,Profile}OwnerTest#testBackupServiceEnabling Change-Id: I11d863229c4d62a058aaf37446a694b9c73ae5b8 Merged-In: I11d863229c4d62a058aaf37446a694b9c73ae5b8 (cherry picked from commit 630dec9eb496bc70db44c4f0b4196ea91e7df6cb)
2020-12-08Merge changes from topic "dec5" am: c2793cf12b am: 9af6ac78b0Jeff Sharkey
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519384 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2776a545a24f007ccb4b9ee14705978571265ef3
2020-12-08Improve OWNERS coverage across frameworks/base/.Jeff Sharkey
As general background, OWNERS files expedite code reviews by helping code authors quickly find relevant reviewers, and they also ensure that stakeholders are involved in code changes in their areas. Some teams under frameworks/base/ have been using OWNERS files successfully for many years, and we're ready to expand them to cover more areas. Here's the historical coverage statistics for the last two years of changes before these new OWNERS changes land: -- 56% of changes are fully covered by OWNERS -- 17% of changes are partially covered by OWNERS -- 25% of changes have no OWNERS coverage Working closely with team leads, we've now identified clear OWNERS on a per-package basis, and we're using "include" directives whenever possible to to simplify future maintenance. With this extensive effort, we've now improved our coverage as follows: -- 98% of changes are fully covered by OWNERS -- 1% of changes are partially covered by OWNERS -- 1% of changes have no OWNERS coverage This specific change is automatically generated by a script that identifies relevant "include" directives. Bug: 174932174 Test: manual Exempt-From-Owner-Approval: refactoring with team leads buy-in Merged-In: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813 Change-Id: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813
2020-12-07Split NetworkUtils and NetworkUtilsInternalRemi NGUYEN VAN
NetworkUtils is planned to move to a dedicated JAR for connectivity classes, while NetworkUtilsInternal would stay in the frameworks-minus-apex JAR, in the com.android.internal.net package. Bug: 171540887 Test: m, boots, wifi working atest FrameworksNetTests Change-Id: I3d38d72ad23a4bf84af823c7baeb6fed25c0665f
2020-11-18Merge "Do not power off display on lockNow() on automotive builds." into ↵Jordan Jozwiak
rvc-qpr-dev am: cad8a4f55e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13037790 Change-Id: I2eae34c713b8ebc41e7332eca7a89f594da84c59
2020-11-11Do not power off display on lockNow() on automotive builds.Felipe Leme
Test: manual verification Fixes: 171517112 Change-Id: I410e06b911b099c0ed4b7b4e3ac493c9a272fa6b Merged-In: I410e06b911b099c0ed4b7b4e3ac493c9a272fa6b (cherry picked from commit fc586009b1fc381dbbc4061f876fc52c11a79814)
2020-11-04DO NOT MERGE: Introduce DPMS shim for active DO/PO checkEran Messeri
Introduce a shim into DevicePolicyManagerInternal & DevicePolicyManagerService so that NetworkStatsAccessTest would not diverge from internal development branches. The DevicePolicyManagerService refactoring on the internal branch removed isActiveAdminWithPolicy in favour of isActiveDeviceOwner and isActiveProfileOwner. These methods are being made available in AOSP for NetworkStatsAccessTest. Bug: 170459325 Test: atest NetworkStatsAccessTest Change-Id: Ic7e0898989fb8222aaba2b35436765c04eb3250c
2020-10-08Fix non-inclusive terms in framework device policy logicRubin Xu
Bug: 170188829 Test: atest FrameworksServicesTests:DevicePolicyManagerTest Merged-In: I8b8ab1442c3f592a4e3ce70852025b1b169d5f18 Change-Id: I8b8ab1442c3f592a4e3ce70852025b1b169d5f18
2020-06-18Change behaviour of screen capture disabledAlex Johnston
Background * Historically, when the screen capture disabled policy was set on the personal profile, screen capture was disabled for the whole device (per-device). * This should be changed to only be disabled in the personal profile (per-profile). Changes * Renamed DevicePolicyCache methods to setScreenCaptureAllowed and isScreenCaptureAllowed * Added parameter ownerCanAddInternalSystemWindow to isScreenCaptureAllowed Bug: 148453838 Bug: 157035400 Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest Change-Id: If1bd68f0ec3e88497c5d3b4382977b526b2364ba
2020-06-12Send MANAGED_PROFILE_* broadcasts to apps with MODIFY_QUIET_MODE.Pierre Barbier de Reuille
Allow apps with MODIFY_QUIET_MODE permission to register broadcast receivers for MANAGED_PROFILE_* in their manifest. Fixes: 158870146 Test: atest 'com.android.cts.devicepolicy.QuietModeHostsideTest#testBroadcastManagedProfileAvailable_withCrossProfileAppsOp' Test: atest 'com.android.cts.devicepolicy.QuietModeHostsideTest#testBroadcastManagedProfileAvailable_withoutCrossProfileAppsOp' Change-Id: I39746c5b3ff3c49f8a903fc52091fcb8d3607c84 (cherry picked from commit cc8b51873bbdd5c1815e58f1c95b478ff7310a88)
2020-06-12Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-devJordan Jozwiak
2020-06-11Merge "Convert personal app suspension on COMP->COPE migration" into rvc-devTreeHugger Robot
2020-06-10Convert personal app suspension on COMP->COPE migrationPavel Grafov
* if no apps are suspended by the DO prior to migration, nothing changes * if some apps were suspended by the DO and the DPC targets R+ via DPM.setPackagesSuspended(), this will result in personal apps suspended explicitly by the PO DPC as if it called DPM.setPersonalAppsSuspended(). The apps will stay suspended. * if the DPC target SDK is below R, the apps will be unsuspended because the DPC won't have a way to unsuspend them. And the user will be stuck with suspended apps. + when unsuspending apps, don't collect the list of apps subject to suspension, but rather unsuspend all that is suspended. It is more robust, e.g. when some app stops meeting the conditions, e.g. not SMS app anymore. Bug: 157270093 Test: com.android.server.devicepolicy.DevicePolicyManagerServiceMigrationTest Test: Manual, with TestDPC, also patching it to target R Change-Id: I1eba7216dd557c94bef822b77d25b484dfcd6f63
2020-06-04Load owner info during DevicePolicyManagerSerivce constructionRubin Xu
While most of the admin policy (DevicePolicyData) is loaded lazily wheneve they are read, the list of Device and Profile owners are currently loaded during PHASE_LOCK_SETTINGS_READY, which means policy getters relying on the list of owners, for example isCommonCriteriaModeEnabled, does not work until this boot phase. It turns out that some other system services (WifiService) will attempt to read the policy before this boot phase and hence fails. Fix this by loading the owner info as part of DevicePolicyManagerSerivce construction, so the info is always available. Test: atest FrameworksServicesTests:DevicePolicyManagerTest Test: Set TestDPC as DO, enable Common Criteria mode, add WiFi, Check /data/misc/apexdata/com.android.wifi/WifiConfigStore.xml for the lack of plaintext WiFi PSK. Test: atest com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testSecurityLogging Bug: 157476512 Change-Id: If403cf98574612cb44f7c8a697095276c65087fe
2020-06-04DO NOT MERGE - Allow locking with feature or permissionJordan Jozwiak
Instead of requiring the DEVICE_ADMIN feature, we accept either the feature or the appropriate permission. Bug: 133240910 Test: Manual testing Verify that API executes when on a device without DEVICE_ADMIN when the caller has the LOCK_DEVICE permission. Change-Id: I30bd0dc81d9d7b7ed5503a926066caffb389b9c0 (cherry picked from commit 3cc489b7f3dfcbe66a469bfce948884aec852ee4)
2020-05-30Merge changes from topic "apr12" into rvc-devJeff Sharkey
* changes: Collect NeededUriGrants without holding locks. Initial splitting of calculation and grants.
2020-05-28Initial splitting of calculation and grants.Jeff Sharkey
In upcoming changes, we'll need to shift the calculation of needed permission grants to occur before we acquire any AM/WM locks; we'll continue to use that calculated list when actually granting. This change also reduces the surface area of how callers in the system server interact with Uri permissions to reduce the risk of accidental misuse. This is a no-op refactoring. Bug: 115619667 Test: atest FrameworksServicesTests:com.android.server.uri Test: atest CtsAppSecurityHostTestCases:android.appsecurity.cts.AppSecurityTests#testPermissionDiffCert Change-Id: Ied529156205903f9b02b4265963fdf59f7dd7f92
2020-05-27Only notify when admin enables location for the userEran Messeri
Only notify the user when the admin enables location services on their device, not on every state change. Prior to this change the user would be notified when the admin disables location services, with a misleading notification indicating apps now have location available. Tested by installing TestDPC, setting it as device owner, then toggling location on and off and observing user is notified only on turning location on. Test both legacy and new method flows. Bug: 156602188 Test: Manual using TestDPC (see above) Change-Id: Ia757802bd7da1afeecfd8071598b692c69860c66
2020-05-21Merge "Prevent DPCs from requesting INTERACT_ACROSS_PROFILES" into rvc-devTreeHugger Robot
2020-05-21Merge "setAutoTimeRequired disabled on managed profile" into rvc-devAlex Johnston
2020-05-20setAutoTimeRequired disabled on managed profileAlex Johnston
* A security exception should be thrown when setAutoTimeRequired is called on a managed profile * Update javadoc Bug: 156620695 Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSetAutoTimeRequired atest com.android.cts.devicepolicy.MixedProfileOwnerTest#testSetAutoTimeRequired atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testSetAutoTimeRequired Change-Id: Ifb53c218947f62aa446aa607d3f4eee354586395
2020-05-19Prevent DPCs from requesting INTERACT_ACROSS_PROFILESAlex Kershaw
Fixes: 156745686 Test: atest com.android.cts.devicepolicy.CrossProfileAppsPermissionHostSideTest#testCanRequestInteractAcrossProfiles_profileOwner_returnsFalse Test: atest services/robotests/src/com/android/server/pm/CrossProfileAppsServiceImplRoboTest.java --verbose Change-Id: Ia72573991ecccd9a9d01285ba55059e7f9ea14b0
2020-05-18Merge "Use exact date and time instead of "tomorrow" in notification" into ↵Pavel Grafov
rvc-dev
2020-05-18Merge "Set explicit target when constructing PendingIntent" into rvc-devTreeHugger Robot
2020-05-15Set explicit target when constructing PendingIntentRubin Xu
PendingIntent as part of a notification can be intercepted by a malicious app and re-fired with crafted intent arguments. System server should set explicit target for these intents to avoid it being fired to other apps with system privilege. Bug: 155183624 Test: atest FrameworksServicesTests:DevicePolicyManagerTest Test: Set a DO/PO with TestDPC, turn on location, verify notification works Test: set a DO with TestDPC, request remote bugreport and verify notifcation works Change-Id: Ib7d0039c3d07a9d1ccf57e944303353ec9e9b66d
2020-05-14Use exact date and time instead of "tomorrow" in notificationPavel Grafov
This helps avoid confusion if the user only sees the notification the next day. Bug: 155740352 Test: manual with TestDPC Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest Change-Id: I6c95a6db2e8967eeffa373f96170cd610f13856a
2020-05-12Merge "Don't suspend personal SMS app" into rvc-devTreeHugger Robot
2020-05-11Merge "Make getPersonalAppsSuspensionReasons more robust." into rvc-devPavel Grafov
2020-05-11Make getPersonalAppsSuspensionReasons more robust.Pavel Grafov
* Make sure that if the time is rolled back after the deadline has been reached, it is not undone. When the deadline is reached it is set to -1 which is far in the past, so timezone change won't affect it. * Return sensible value in case when the deadline has just expired and the suspension itself hasn't been enacted. Previously the deadline expiration wouldn't be reflected until mAppsSuspended gets updated after all apps are suspended. * Update deadline on time changes. This makes it react to time changes via adb. * Additional debug logging to investigate further if the issue persists. Bug: 155878352 Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest Change-Id: I6549f76584121df200ace811285e7a358f262869
2020-05-10Don't suspend personal SMS appPavel Grafov
Bug: 155847669 Test: atest OrgOwnedProfileOwnerTest#testPersonalAppsSuspensionSms Change-Id: Ic7147bd63a1c866e404f16c0159c79175403a836
2020-05-10Make notification match the mocks.Pavel Grafov
* Now it is of nice blue colour, lighter in night theme. * Uses suitcase icon instead of warning sign. * Shows "Work profile" instead of "Android system" as the source. note: I reused a string for "Work profile", which has the same content, but different purpose. This is not ideal, but we are way past the deadline. Bug: 155612405 Test: manual, with TestDPC Change-Id: I8298401742085b1738de384e3fe0e612a8142607
2020-05-07Merge "Restrict creation of secondary users" into rvc-devAlex Johnston
2020-05-07Restrict creation of secondary usersAlex Johnston
Background * Secondary users should be disabled when the device is an organization-owned managed profile device. * This is because supporting secondary users would complicate the semantics of user restrictions. Changes * Add DISALLOW_ADD_USER as a base restriction when the device is an organization-owned managed profile device. * Handle removal case when the device is no longer in this mode. * Remove the ability of other admins to apply DISALLOW_ADD_USER. Manual Testing Steps * Provision an organization-owned managed profile device. * Check Settings > System > Multiple users and verify that a user cannot be added. * Check WP TestDPC 'Set user restrictions on parent' and verify 'Disallow add user' is not present. Bug: 155281701 Test: Manual testing atest com.android.server.devicepolicy.DevicePolicyManagerTest Change-Id: I83348fc8b854cef20383803124000540b5b130cb
2020-05-04Merge "Add custom Error Prone check for SDK comparisons." into rvc-devJeff Sharkey
2020-05-04Add custom Error Prone check for SDK comparisons.Jeff Sharkey
Over the years we've had several obscure bugs related to how SDK level comparisons are performed, specifically during the window of time where we've started distributing the "frankenbuild" to developers. Consider the case where a framework developer shipping release "R" wants to only grant a specific behavior to modern apps; they could write this in two different ways: 1. if (targetSdkVersion > Build.VERSION_CODES.Q) { 2. if (targetSdkVersion >= Build.VERSION_CODES.R) { The safer of these two options is (2), which will ensure that developers only get the behavior when *both* the app and the platform concur on the specific SDK level having shipped. Consider the breakage that would happen with option (1) if we started shipping APKs that are based on the final R SDK, but are then installed on earlier preview releases which still consider R to be CUR_DEVELOPMENT; they'd risk crashing due to behaviors that were never part of the official R SDK. Bug: 64412239 Test: ./build/soong/soong_ui.bash --make-mode services RUN_ERROR_PRONE=true Exempt-From-Owner-Approval: trivial blueprint changes Change-Id: Ia20181f8602451ac9a719ea488d148e160708592
2020-05-01Merge "Add button to personal apps suspension notification" into rvc-devPavel Grafov