Commit Graph

3 Commits

Author SHA1 Message Date
Xin Li
f0e00b8bf7 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I96574a79eba581db95d387f0d9c9fde2e004c41c
Change-Id: Ib9f2c742f8aa72651ef9eca80a716dd94b9041ea
2024-05-23 14:12:07 -07:00
Oriol Prieto Gasco
ed2b12ce21 Set the container field of aconfig flags
Please see go/aconfig-flag-containers for more context

Test: m
Bug: 312769710
Change-Id: I828a1a1c5ab944283341ace924db97c4eadb7a7f
2024-02-07 20:00:41 +00:00
Jan Tomljanovic
6b4c754f5e Add auth challenge for increasing screen timeout.
We only require one auth after onStart(), and only for increasing the
timeout.

Test: atest SettingsRoboTests:com.android.settings.display.ScreenTimeoutSettingsTest
Test: also manually tested
Bug: 315937886
Change-Id: If4aed67736cd7545d3a518aadd8253ea6a9fae43
2023-12-20 21:53:56 +00:00