diff options
author | 2024-02-01 00:08:54 +0000 | |
---|---|---|
committer | 2024-02-01 00:08:54 +0000 | |
commit | eb8c87af8298f27a01c8b4b3b5a42ac7c88727f6 (patch) | |
tree | c8345b6b0a1f5495980ebf2bc8dbcf15be4d7220 | |
parent | 9f3fe75e3c611610149ec95314d5a34346f3cbe6 (diff) | |
parent | 3ff7bab6937f34ac4245f7e1682c7a5a18cffca0 (diff) |
[DON'T BLOCK] Test ownership migration rules am: 3ff7bab693
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2939780
Change-Id: Ia9c34645719248e42236d8e7420943e59527ad81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
42 files changed, 47 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp index 59742acc1..ae681e403 100644 --- a/Android.bp +++ b/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], default_visibility: [":__subpackages__"], } @@ -69,8 +70,8 @@ sdk { bootclasspath_fragment { name: "com.android.permission-bootclasspath-fragment", contents: [ - "framework-permission", - "framework-permission-s", + "framework-permission", + "framework-permission-s", ], apex_available: ["com.android.permission"], diff --git a/PermissionController/Android.bp b/PermissionController/Android.bp index ebcb5f3f3..442495df2 100644 --- a/PermissionController/Android.bp +++ b/PermissionController/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: [ "packages_modules_Permission_PermissionController_license", ], diff --git a/PermissionController/iconloaderlib/Android.bp b/PermissionController/iconloaderlib/Android.bp index 2bc3de435..2a886a276 100644 --- a/PermissionController/iconloaderlib/Android.bp +++ b/PermissionController/iconloaderlib/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/PermissionController/role-controller/Android.bp b/PermissionController/role-controller/Android.bp index 6d4bf52c6..437d7ca5e 100644 --- a/PermissionController/role-controller/Android.bp +++ b/PermissionController/role-controller/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/PermissionController/tests/inprocess/Android.bp b/PermissionController/tests/inprocess/Android.bp index 7d55ff9cc..7227e41ad 100644 --- a/PermissionController/tests/inprocess/Android.bp +++ b/PermissionController/tests/inprocess/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_android_permissions", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_modules_Permission_PermissionController_license" diff --git a/PermissionController/tests/inprocess/AppThatUsesCameraPermission/Android.bp b/PermissionController/tests/inprocess/AppThatUsesCameraPermission/Android.bp index 14198cb6d..a6bd07a49 100644 --- a/PermissionController/tests/inprocess/AppThatUsesCameraPermission/Android.bp +++ b/PermissionController/tests/inprocess/AppThatUsesCameraPermission/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_android_permissions", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_modules_Permission_PermissionController_license" diff --git a/PermissionController/tests/mocking/Android.bp b/PermissionController/tests/mocking/Android.bp index 416e14847..837b055a8 100644 --- a/PermissionController/tests/mocking/Android.bp +++ b/PermissionController/tests/mocking/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_android_permissions", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_modules_Permission_PermissionController_license" diff --git a/PermissionController/tests/outofprocess/Android.bp b/PermissionController/tests/outofprocess/Android.bp index acb4ab5bd..83bb65d6b 100644 --- a/PermissionController/tests/outofprocess/Android.bp +++ b/PermissionController/tests/outofprocess/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_android_permissions", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_modules_Permission_PermissionController_license" diff --git a/PermissionController/tests/permissionui/Android.bp b/PermissionController/tests/permissionui/Android.bp index 41b5f88ed..6aa0dc45c 100644 --- a/PermissionController/tests/permissionui/Android.bp +++ b/PermissionController/tests/permissionui/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_android_permissions", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_modules_Permission_PermissionController_license" diff --git a/PermissionController/tests/permissionui/PermissionUiDefineAdditionalPermissionApp/Android.bp b/PermissionController/tests/permissionui/PermissionUiDefineAdditionalPermissionApp/Android.bp index 13205b354..e93bb995f 100644 --- a/PermissionController/tests/permissionui/PermissionUiDefineAdditionalPermissionApp/Android.bp +++ b/PermissionController/tests/permissionui/PermissionUiDefineAdditionalPermissionApp/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_android_permissions", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_modules_Permission_PermissionController_license" diff --git a/PermissionController/tests/permissionui/PermissionUiUseAdditionalPermissionApp/Android.bp b/PermissionController/tests/permissionui/PermissionUiUseAdditionalPermissionApp/Android.bp index 7073b02cc..5fc26a3f0 100644 --- a/PermissionController/tests/permissionui/PermissionUiUseAdditionalPermissionApp/Android.bp +++ b/PermissionController/tests/permissionui/PermissionUiUseAdditionalPermissionApp/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_android_permissions", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_modules_Permission_PermissionController_license" diff --git a/PermissionController/tests/permissionui/PermissionUiUseCameraPermissionApp/Android.bp b/PermissionController/tests/permissionui/PermissionUiUseCameraPermissionApp/Android.bp index 71616bd83..80252c891 100644 --- a/PermissionController/tests/permissionui/PermissionUiUseCameraPermissionApp/Android.bp +++ b/PermissionController/tests/permissionui/PermissionUiUseCameraPermissionApp/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_android_permissions", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_modules_Permission_PermissionController_license" diff --git a/PermissionController/tests/permissionui/PermissionUiUseStoragePermissionApp/Android.bp b/PermissionController/tests/permissionui/PermissionUiUseStoragePermissionApp/Android.bp index 56022ca2d..fe7be2ee2 100644 --- a/PermissionController/tests/permissionui/PermissionUiUseStoragePermissionApp/Android.bp +++ b/PermissionController/tests/permissionui/PermissionUiUseStoragePermissionApp/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_android_permissions", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_modules_Permission_PermissionController_license" diff --git a/PermissionController/tests/permissionui/PermissionUiUseTwoAdditionalPermissionsApp/Android.bp b/PermissionController/tests/permissionui/PermissionUiUseTwoAdditionalPermissionsApp/Android.bp index aeff19c2d..a681f51bb 100644 --- a/PermissionController/tests/permissionui/PermissionUiUseTwoAdditionalPermissionsApp/Android.bp +++ b/PermissionController/tests/permissionui/PermissionUiUseTwoAdditionalPermissionsApp/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_android_permissions", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_modules_Permission_PermissionController_license" diff --git a/SafetyCenter/Annotations/Android.bp b/SafetyCenter/Annotations/Android.bp index c04f40333..12d2c0fb0 100644 --- a/SafetyCenter/Annotations/Android.bp +++ b/SafetyCenter/Annotations/Android.bp @@ -16,6 +16,7 @@ // Library for internal data used by Safety Center system service and UI. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/SafetyCenter/Config/Android.bp b/SafetyCenter/Config/Android.bp index 895b242b0..d6423288a 100644 --- a/SafetyCenter/Config/Android.bp +++ b/SafetyCenter/Config/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. // package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/SafetyCenter/Config/tests/Android.bp b/SafetyCenter/Config/tests/Android.bp index c58f2c922..3adedfc25 100644 --- a/SafetyCenter/Config/tests/Android.bp +++ b/SafetyCenter/Config/tests/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/SafetyCenter/Config/tests/overlay/Android.bp b/SafetyCenter/Config/tests/overlay/Android.bp index 65eab02f1..a6f9fb2dd 100644 --- a/SafetyCenter/Config/tests/overlay/Android.bp +++ b/SafetyCenter/Config/tests/overlay/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/SafetyCenter/ConfigLintChecker/Android.bp b/SafetyCenter/ConfigLintChecker/Android.bp index ff1e28009..fad0165df 100644 --- a/SafetyCenter/ConfigLintChecker/Android.bp +++ b/SafetyCenter/ConfigLintChecker/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/SafetyCenter/InternalData/Android.bp b/SafetyCenter/InternalData/Android.bp index aa8f96c8b..c89db4962 100644 --- a/SafetyCenter/InternalData/Android.bp +++ b/SafetyCenter/InternalData/Android.bp @@ -16,6 +16,7 @@ // Library for internal data used by Safety Center system service and UI. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/SafetyCenter/PendingIntents/Android.bp b/SafetyCenter/PendingIntents/Android.bp index 05bec7988..e9b810df8 100644 --- a/SafetyCenter/PendingIntents/Android.bp +++ b/SafetyCenter/PendingIntents/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. // package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/SafetyCenter/Persistence/Android.bp b/SafetyCenter/Persistence/Android.bp index 56ce4491b..d7e1a60dc 100644 --- a/SafetyCenter/Persistence/Android.bp +++ b/SafetyCenter/Persistence/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. // package { + default_team: "trendy_team_safety_center", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/SafetyCenter/Persistence/tests/Android.bp b/SafetyCenter/Persistence/tests/Android.bp index d72dfdd29..c3342ab18 100644 --- a/SafetyCenter/Persistence/tests/Android.bp +++ b/SafetyCenter/Persistence/tests/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_safety_center", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/SafetyCenter/Resources/Android.bp b/SafetyCenter/Resources/Android.bp index 06f7e5f25..6f635c885 100644 --- a/SafetyCenter/Resources/Android.bp +++ b/SafetyCenter/Resources/Android.bp @@ -16,6 +16,7 @@ // APK to hold all the Safety Center overlayable resources. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -51,5 +52,5 @@ android_app { android_app_certificate { name: "com.android.safetycenter.resources.certificate", - certificate: "com.android.safetycenter.resources" + certificate: "com.android.safetycenter.resources", } diff --git a/SafetyCenter/ResourcesLib/Android.bp b/SafetyCenter/ResourcesLib/Android.bp index ebc7aa017..4829dbc40 100644 --- a/SafetyCenter/ResourcesLib/Android.bp +++ b/SafetyCenter/ResourcesLib/Android.bp @@ -16,6 +16,7 @@ // Library to manage all the Safety Center overlayable resources. package { + default_team: "trendy_team_safety_center", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/SafetyCenter/ResourcesLib/tests/Android.bp b/SafetyCenter/ResourcesLib/tests/Android.bp index 75fead776..18d98ccb6 100644 --- a/SafetyCenter/ResourcesLib/tests/Android.bp +++ b/SafetyCenter/ResourcesLib/tests/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_safety_center", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/SafetyCenter/ResourcesLib/tests/SafetyCenterResourcesLibTestResources/Android.bp b/SafetyCenter/ResourcesLib/tests/SafetyCenterResourcesLibTestResources/Android.bp index 18628805d..7306ee247 100644 --- a/SafetyCenter/ResourcesLib/tests/SafetyCenterResourcesLibTestResources/Android.bp +++ b/SafetyCenter/ResourcesLib/tests/SafetyCenterResourcesLibTestResources/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_safety_center", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/SafetyLabel/Android.bp b/SafetyLabel/Android.bp index 119890d3f..70307242d 100644 --- a/SafetyLabel/Android.bp +++ b/SafetyLabel/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -46,4 +47,3 @@ java_library { "//packages/modules/Permission:__subpackages__", ], } - diff --git a/SafetyLabel/tests/Android.bp b/SafetyLabel/tests/Android.bp index 2026a6ac8..613eda2c6 100644 --- a/SafetyLabel/tests/Android.bp +++ b/SafetyLabel/tests/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/framework-s/Android.bp b/framework-s/Android.bp index b2f2f21be..5ee0aac78 100644 --- a/framework-s/Android.bp +++ b/framework-s/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/framework/Android.bp b/framework/Android.bp index 33fda68c2..bd4c9dc81 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/permissions/Android.bp b/permissions/Android.bp index 6c1fdb8f8..fb84e0537 100644 --- a/permissions/Android.bp +++ b/permissions/Android.bp @@ -1,4 +1,3 @@ - // // Copyright (C) 2022 The Android Open Source Project // @@ -15,6 +14,7 @@ // limitations under the License. // package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], default_visibility: ["//packages/modules/Permission:__subpackages__"], } diff --git a/service/Android.bp b/service/Android.bp index c6a00748d..66697e983 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/testing/Android.bp b/testing/Android.bp index 8abed1e0c..d74510754 100644 --- a/testing/Android.bp +++ b/testing/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/apex/Android.bp b/tests/apex/Android.bp index 126fcb4b2..83bf4e252 100644 --- a/tests/apex/Android.bp +++ b/tests/apex/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/cts/safetycenter/Android.bp b/tests/cts/safetycenter/Android.bp index e980841b5..6e0fedec0 100644 --- a/tests/cts/safetycenter/Android.bp +++ b/tests/cts/safetycenter/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_safety_center", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/functional/safetycenter/multiusers/Android.bp b/tests/functional/safetycenter/multiusers/Android.bp index c1c7a95e7..b5caf48e6 100644 --- a/tests/functional/safetycenter/multiusers/Android.bp +++ b/tests/functional/safetycenter/multiusers/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_safety_center", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/functional/safetycenter/safetycenteractivity/Android.bp b/tests/functional/safetycenter/safetycenteractivity/Android.bp index af0020e91..ea5f9f286 100644 --- a/tests/functional/safetycenter/safetycenteractivity/Android.bp +++ b/tests/functional/safetycenter/safetycenteractivity/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_safety_center", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/functional/safetycenter/singleuser/Android.bp b/tests/functional/safetycenter/singleuser/Android.bp index 995f3ca40..fa7b6475b 100644 --- a/tests/functional/safetycenter/singleuser/Android.bp +++ b/tests/functional/safetycenter/singleuser/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_safety_center", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/tests/hostside/safetycenter/Android.bp b/tests/hostside/safetycenter/Android.bp index c66cae23a..10258f95b 100644 --- a/tests/hostside/safetycenter/Android.bp +++ b/tests/hostside/safetycenter/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_safety_center", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -37,4 +38,4 @@ java_test_host { "general-tests", "mts-permission", ], -}
\ No newline at end of file +} diff --git a/tests/hostside/safetycenter/helper-app/Android.bp b/tests/hostside/safetycenter/helper-app/Android.bp index cf4372d99..d15caceaa 100644 --- a/tests/hostside/safetycenter/helper-app/Android.bp +++ b/tests/hostside/safetycenter/helper-app/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_safety_center", default_applicable_licenses: ["Android-Apache-2.0"], } @@ -32,4 +33,4 @@ android_test_helper_app { "androidx.test.ext.junit", "safety-center-test-util-lib", ], -}
\ No newline at end of file +} diff --git a/tests/utils/safetycenter/Android.bp b/tests/utils/safetycenter/Android.bp index 1c76dc775..6accefae9 100644 --- a/tests/utils/safetycenter/Android.bp +++ b/tests/utils/safetycenter/Android.bp @@ -14,6 +14,7 @@ // limitations under the License. // package { + default_team: "trendy_team_android_permissions", default_applicable_licenses: ["Android-Apache-2.0"], } |