summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-29[RoleManagerTest][Wear]Use text selector for some buttonstemp_319669529Yeabkal Wubshit
The resource selectors are not alwalys working well for Wear's Compose based UI, so we're here using text selectors, which work well. Bug: 312618575 Test: atest RoleManagerTest Merged-In: I9355c44d196061398015858c96f51bc78f8e4374 Change-Id: I9355c44d196061398015858c96f51bc78f8e4374
2024-02-21Add androidx.annotation_annotation dependency. am: 92bfe73981Muhammad Qureshi
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2962954 Change-Id: If06b5769a4895c4fb28c2236befcd967ee9e570d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-14Add androidx.annotation_annotation dependency.Muhammad Qureshi
stats-log-api-gen adds missing @RequiresApi annotations to the generated StatsLog.write() calls. The library pulling in the changes needs to depend on androidx.annotation_annotation which provides @RequiresApi annotation. Bug: 319044160 Test: m Change-Id: Icf66ea609b4ef709f8d86f99e016a206dd437cab
2024-02-09Remove sergeynv@google.com from ↵Owner Cleanup Bot
PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS am: d3d57783b0 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2957032 Change-Id: I6b6c0c57747471e2c7007cf437b329eb7e1ed450 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09Remove sergeynv@google.com from ↵Owner Cleanup Bot
PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS This suggested change is automatically generated based on group memberships and affiliations. If this change is unnecessary or in error, vote CR -1 and the bot will abandon it. Vote CR +1/2 to approve this change. See the owner's recent activity for context: https://android-review.googlesource.com/q/sergeynv@google.com To report an issue, file a bug in the Infra>Codereview component. Change-Id: Id34964c4352c444bda7e59ff9694b5e1f48ed284
2024-02-01Merge "[Thread] add MANAGE_DEVICE_POLICY_THREAD_NETWORK for CTS" into ↵Treehugger Robot
aosp-main-future
2024-02-01[Thread] add MANAGE_DEVICE_POLICY_THREAD_NETWORK for CTSKangping Dong
This commit reolves merge conflict in aosp/2900149 Bug: 323082932 Bug: 319198393 Merged-In: I76b8c05587d0a491b18cfdbbed98b660d15401bc Change-Id: I76b8c05587d0a491b18cfdbbed98b660d15401bc
2024-02-01[DON'T BLOCK] Test ownership migration rules am: 3ff7bab693Aditya Choudhary
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>
2024-01-31[DON'T BLOCK] Test ownership migration rulesAditya Choudhary
This CL is created as a best effort to migrate test targets to the new android ownership model. If you find incorrect or unnecessary attribution in this CL, please create a separate CL to fix that. For more details please refer to the link below, <add g3 doc link> Bug: 304529413 Test: N/A Change-Id: Icbe839de65c4449f764bd579a9f8c43f9fac770d Merged-In: Icbe839de65c4449f764bd579a9f8c43f9fac770d
2024-01-30Merge Android 24Q1 Release (ab/11220357)Xin Li
Bug: 319669529 Merged-In: Ie0cd5fb48727ea633b683975f6313491adc253de Change-Id: Ie6ebf3ae00fadcc18e97321e4d4e98f49bafe331
2024-01-30Mark GrantPermissionsViewModel callback as nullable am: dfd3b760ddNate Myren
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2933630 Change-Id: I099e91af6d2baefd937ad1bf82a466c56f51ae78 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29Mark GrantPermissionsViewModel callback as nullableNate Myren
See: Ic6258b39fdbd7a7280c65f9e39e12c923dbcee48 Bug: 322010736 Change-Id: Ic879284a7480aa9bdf35bb8f1f9efff8622909d3 Merged-In: I7fa6f428512cf94518585b2fd5a4e0d9685923d7 Test: presubmit
2024-01-26Remove java_api_contribution modules from .bp files am: a02b932f6eJihoon Kang
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2924366 Change-Id: I22e0f0b837809b2d3e978abbbe0b82ea30b499e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25Remove java_api_contribution modules from .bp filesJihoon Kang
java_api_contribution modules are dynamically generated from droidstubs modules or java_sdk_library_import, and is not a user-facing module. Defining this module is a .bp file is a no-op. Test: m nothing Bug: 322242515 Change-Id: I68e450e4c7bbf4a077bfb43cd7e1bbcde4f5a6cc
2024-01-17clean up location_accuracy flag am: 5bddbe513emrulhania
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2914825 Change-Id: I3487ab68b9ba0de072d1ac133296cb026780e2cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-17clean up location_accuracy flagmrulhania
The feature is now always enabled on S+ devices. Bug: 294870972 Bug: 320229211 Test: atest LocationAccuracyTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e65d302d69c03d9029cf9834074899da1a7790c4) Merged-In: Ia2cbffe3714ea4edc3c3de67a9340e9088786dc6 Change-Id: Ia2cbffe3714ea4edc3c3de67a9340e9088786dc6
2023-12-21List baseline_filename on modules that are implititly using it am: 56793826fdCole Faust
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2886328 Change-Id: Idd578f40fddec1e75b1a38de7c8c5d9c7df32b29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20List baseline_filename on modules that are implititly using itCole Faust
lintable modules currently pick up files named "lint-baseline.xml" to use as the lint baseline implicitly. This is confusing because you could end up using the baseline files in more modules than intended. Lint also has a feature where it requests you remove unnecessary findings from the baseline file, so something could be necessary for one module, but unnecessary for another that accidentally picked up the baseline. We're removing the implicit detection of the baseline file, which requires all modules using it to list the baseline file explicitly. Bug: 272769514 Test: Presubmits Change-Id: I53ae4b2089edb643deb743b982c21e14667f84fc
2023-12-14Merge "Fix for Overlapping Time Text UI" into mainVignesh Ramanathan
2023-12-14Merge "Remove robhor@google.com from ↵Julie Pan
PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS" into main am: 79d2d43fc4 am: d5b82aab34 am: 362a071378 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2853217 Change-Id: I28b7a9ded8a9da991479cedb2cbc6147beeea4f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "Remove robhor@google.com from ↵Julie Pan
PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS" into main am: 79d2d43fc4 am: d5b82aab34 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2853217 Change-Id: Idf4dafe3778833c9ce1cf80a28b63903a3767054 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "Remove robhor@google.com from ↵Julie Pan
PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS" into main am: 79d2d43fc4 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2853217 Change-Id: I66b8d3dcc29db03a982844364b1830f31c109a76 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "Remove robhor@google.com from ↵Julie Pan
PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS" into main
2023-12-13Fix for Overlapping Time Text UIvigneshrsastra
Fixes: b/299235452 Test: Tested Manually. Existing tests continue to pass. Screen Recording: https://screenshot.googleplex.com/6bcg88tTfAPMAn8 Change-Id: Ie0cd5fb48727ea633b683975f6313491adc253de
2023-12-13Merge "VibratorManager: Add check to testVibrator" into mainYixiao Luo
2023-12-13Merge "Fix for Swipe to Dismiss Animation" into mainVignesh Ramanathan
2023-12-13Merge "Fix testVibrator test" into mainAhmad Khalil
2023-12-13[Role Logic Move] Add migration logic for isRoleFallbackEnabledYi-an Chen
Migrate the isRoleFallbackEnabled preference to system server as a part of the role logic move project. We only do the migration if it's V+. On the system server side it will check the existing preference in SharedPreference and migrate for all roles for the user. API-Coverage-Bug: 314281553 Bug: 302563864 Test: RolePersistenceTest and RoleManagerTest Change-Id: Ib24ebb8211359a652e52007fecf79a2390575e9c
2023-12-13Fix for Swipe to Dismiss Animationvigneshrsastra
Fixes: b/307873239 Test: Existing Swipe back animations checked. Screen Capture here: https://screenshot.googleplex.com/Bd2U66tnRhAJvse Change-Id: Ifecb8d76f4039321f3c4c61e7728b4da0933b79d
2023-12-12Merge "Remove left over string resources for wear" into mainJustin Chung
2023-12-12Merge "Revert "Add permission listener tests for virtual devices"" into mainPriyanka Advani
2023-12-12Revert "Add permission listener tests for virtual devices"Priyanka Advani
This reverts commit 99fd29801f072fa41f548783ac958aea87a51679. Reason for revert: Droid-monitored created revert due to b/315831838. Will be running through ABTD before submitting the revert. Change-Id: I36fecad33313673c545330419119915f11d415df
2023-12-12VibratorManager: Add check to testVibratorSham Rathod
Added a check to verify if the device hardware supports vibrator before running the testVibrator test. Test: atest CtsPermissionTestCases Bug: 305144248 (cherry picked from https://partner-android-review.googlesource.com/q/commit:7f65e2c0f826633df37f3bc49d87bacd1783f574) Merged-In: I27f28f611c8ce8250104ab748277cd2d54de4be6 Change-Id: I27f28f611c8ce8250104ab748277cd2d54de4be6
2023-12-12Merge "Enforce non nullable to compile with kotlin rules" into mainManjeet Rulhania
2023-12-12Merge "Update CTS tests for the new a11y motion observing permission." into mainAmeer Armaly
2023-12-12Remove left over string resources for wearHoa Xuan
Both wear_not_allowed_dlg_title and wear_not_allowed_dlg_text are no longer in use. So that clean up two resources. Defer-CP-To-Master: 313415715 Bug: 313415715 Test: m Change-Id: I1c3de686fa471674816bfeb0be811cd75c1ddbf2
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: e184bea3f1 -s ours am: ↵Xin Li
27df40a969 -s ours am: 51508b8afa -s ours am skip reason: Merged-In I9e48a0e610c6a3ed760ff2c4b6db0e0b74783172 with SHA-1 8139f91839 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2863578 Change-Id: Iaa8ad6150d7df89bef9071872a2fcd688915d542 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: e184bea3f1 -s ours am: ↵Xin Li
27df40a969 -s ours am skip reason: Merged-In I9e48a0e610c6a3ed760ff2c4b6db0e0b74783172 with SHA-1 8139f91839 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2863578 Change-Id: I3f8a278d80a5af1aadcabf421f1663ab84421cd4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: e184bea3f1 -s oursXin Li
am skip reason: Merged-In I9e48a0e610c6a3ed760ff2c4b6db0e0b74783172 with SHA-1 8139f91839 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2863578 Change-Id: I1d03d97d0514ec1cd8e3cfe2fa17d02db00ae1ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Enforce non nullable to compile with kotlin rulesManjeet Rulhania
Bug: 314213681 Test: build
2023-12-11Merge "Add permission listener tests for virtual devices" into mainManjeet Rulhania
2023-12-09Inline literal string value of Flags in API signature filesPaul Duffin
Previously, due to a mismatch between Metalava and the output of `java_aconfig_library`, flag constants did not have their literal value inlined in the API signature files. That would cause problems with future changes to filter APIs by flags. This change is part of a topic that updates Metalava to inline the values into `@FlaggedApi` and update the API signature files. Bug: 314319629 Test: m checkapi Change-Id: I222466e8f8bda8564509c02db7ce324bc9f2174d
2023-12-09Merge "Revert "Fix for Swipe to Dismiss Animation"" into mainVignesh Ramanathan
2023-12-09Merge "Revert "Fix for Overlapping Time Text UI"" into mainVignesh Ramanathan
2023-12-09Merge "Revert "Fix for Scroll Bar Visibility with RSB Scroll"" into mainVignesh Ramanathan
2023-12-09Merge "Revert "Adding Androidx.wear_wear dependency"" into mainVignesh Ramanathan
2023-12-09Add permission listener tests for virtual devicesmrulhania
Tested the changes locally by overriding the flag locally, see: go/aconfig-override Bug: 306676648 Test: atest PermissionUpdateListenerTest --iterations 10 Change-Id: I8e2b1afb7f357dbce5b99181d482b313bfd4010d
2023-12-08Merge "Rename device aware permissions apis flag" into mainTreehugger Robot
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I9e48a0e610c6a3ed760ff2c4b6db0e0b74783172 Bug: 315507370 Change-Id: I216fd271195bded9b184c32a0903b8c30e5d6cd1
2023-12-08Revert "Fix for Swipe to Dismiss Animation"Vignesh Ramanathan
This reverts commit 25903669206de662ce9c66432a5ad37e87d7a7fe. Reason for revert: DroidMonitor: Potential culprit for Bug X - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. b/315500648 This is a child CL that needs to be reverted. Change-Id: I74c46db049dc5035b55fc988c838069094552c26
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 12:58:02 +0000