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
c4ec19acfa Protect "Lock after timeout" page with an auth challenge.
Test: manual
Bug: 315937886

Change-Id: Ib3da9f783892828c0c9cfdc4ebb27b2d982e5274
2023-12-21 14:45:12 +00:00