Commit Graph

146281 Commits

Author SHA1 Message Date
Hakjun Choi
3f5cf60cc7 Clean up aconfig flag oem_enabled_satellite_flag
Bug: 374994012
Test: atest SubscriptionInfoListViewModelTest
Test: manual test in live network
FLAG: EXEMPT flag clean up
Change-Id: Ib9f9f692658df13aad45f2e889a48f2bffed9ed4
2025-02-03 09:16:48 +00:00
Treehugger Robot
e8afedea91 Merge "Desktop Experience needs the device to be eligible" into main 2025-02-01 04:56:13 -08:00
Treehugger Robot
13476cdea4 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours am: 55de28ad5f -s ours am: c6f3f33258 -s ours am: 055febeeb4 -s ours am: 638c49a6b2 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: I6f7725b0829d753e5bb89cddee9325b700ab12fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:32:29 -08:00
Treehugger Robot
b2b8623b6b [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours am: 8984963099 -s ours am: 1451c50e5a -s ours am: ce8bc299bf -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: I18f9f08945213e061b457922953e37c782c396ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:32:19 -08:00
Treehugger Robot
5ff869492b [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b -s ours am: 78f62d8269 -s ours am: 3cd2d3b8fe -s ours am: 8852d1464c -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830

Change-Id: Ia07d639c73ad87dbf110f91975ca6c98dad3bf5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:32:06 -08:00
Fan Wu
109652faec [automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08 -s ours am: 81a5d7b696 -s ours am: 44ed327b4c -s ours am: a0a32c32dd -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830

Change-Id: I6840e5bd5d85ba8ce688f4220a09f4c8451d2bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:32:02 -08:00
Treehugger Robot
1d7f4ce029 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into udc-dev am: 54ee76b649 am: c9a7157c71 -s ours am: 4df8ee0043 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 201d7ffac4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226833

Change-Id: Ibc35ba5567852625eda9cbff1ccd20558cf2561c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:31:49 -08:00
Treehugger Robot
d2b9b3ee4b [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours am: 55de28ad5f -s ours am: c6f3f33258 -s ours am: 5ef3e25948 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: Ic2b0319337c8f725eef78cc0a6b8dad5042c77ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:19:33 -08:00
Treehugger Robot
f75bb9fc4d [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours am: 8984963099 -s ours am: 5ccbef81b8 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: I06a342b56714dd0e0630ccbec19c2c6003c44b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:19:23 -08:00
Treehugger Robot
a05609a68a [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b -s ours am: 78f62d8269 -s ours am: e5a837a9d8 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830

Change-Id: If3f51a0cd31f94cde5abd59503fed5672de6f9be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:19:10 -08:00
Treehugger Robot
5ef3e25948 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours am: 55de28ad5f -s ours am: c6f3f33258 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: I0354cdc556691a539bc530284517a660489918da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:19:06 -08:00
Treehugger Robot
638c49a6b2 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours am: 55de28ad5f -s ours am: c6f3f33258 -s ours am: 055febeeb4 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: I1768ef92573048039bd41e33d025e8656f680aae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:19:05 -08:00
Fan Wu
ca068c9cea [automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08 -s ours am: 81a5d7b696 -s ours am: 82d37340b5 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830

Change-Id: I86143c1d0ba64f156ef4bf6eaf11bad75e49822e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:19:05 -08:00
Treehugger Robot
b7ce11b8e2 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into udc-dev am: 54ee76b649 am: d95916adb5 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 201d7ffac4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226833

Change-Id: Ied53c521712642c86285c4db0e80969a72860501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:18:52 -08:00
Treehugger Robot
055febeeb4 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours am: 55de28ad5f -s ours am: c6f3f33258 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: Ie55525fb0bf7c3ae6fb7c1f4a24cf29edefaf190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:15:36 -08:00
Treehugger Robot
ce8bc299bf [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours am: 8984963099 -s ours am: 1451c50e5a -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: I448da232ef6f34776c5a6004b056b4ecb28878a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:07:43 -08:00
Treehugger Robot
8852d1464c [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b -s ours am: 78f62d8269 -s ours am: 3cd2d3b8fe -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830

Change-Id: If70682d5bf713b0792d63f339be6015c27070fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:07:34 -08:00
Fan Wu
a0a32c32dd [automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08 -s ours am: 81a5d7b696 -s ours am: 44ed327b4c -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830

Change-Id: I6a09f83e08b791ca0ab3a012de25c1b4a78d9216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:07:30 -08:00
Treehugger Robot
4df8ee0043 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into udc-dev am: 54ee76b649 am: c9a7157c71 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 201d7ffac4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226833

Change-Id: I33192a50d4d49ed38bf3693af58514cb72c98795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:07:21 -08:00
Treehugger Robot
c6f3f33258 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours am: 55de28ad5f -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: I85e500ef02493fd5a37336b8b983312979e4e407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:06:05 -08:00
Treehugger Robot
1451c50e5a [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours am: 8984963099 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: Ib018070849f9cfdd309ccad457d300f635601e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 04:04:22 -08:00
Treehugger Robot
5ccbef81b8 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours am: 8984963099 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: I2cd5429035be307341db245ad64dde312ebc693b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:52:32 -08:00
Treehugger Robot
e5a837a9d8 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b -s ours am: 78f62d8269 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830

Change-Id: I2970c99575de748f8ee3bc8b7f6807fd321af11d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:52:23 -08:00
Fan Wu
82d37340b5 [automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08 -s ours am: 81a5d7b696 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830

Change-Id: I7fd0cb6aeeaceafb9736eed5c1348c27f7ebbbd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:52:20 -08:00
Treehugger Robot
8984963099 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: 007a226ba9 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: I4821f3d369279bb44b031895e32fead87de95382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:52:18 -08:00
Treehugger Robot
d95916adb5 Merge "Check the permission of the callingUid instead of the calling package" into udc-dev am: 54ee76b649
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226833

Change-Id: I589e0940eba59d1696d4b3d0ec32b0ff19ac447f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:52:09 -08:00
Treehugger Robot
55de28ad5f [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c am: f8c6feffe5 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 353cfc1b08 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: I213e8ca7c014faa461b47da068ef777882aaddf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:50:46 -08:00
Treehugger Robot
3cd2d3b8fe [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b -s ours am: 78f62d8269 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830

Change-Id: Ica7cf1e1a8660b9c295bdb051e0ebb780266c56d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:48:29 -08:00
Fan Wu
44ed327b4c [automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08 -s ours am: 81a5d7b696 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830

Change-Id: Ia03cc7dca52005f828351b222dcb6de3b67e16f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:48:23 -08:00
Treehugger Robot
c9a7157c71 Merge "Check the permission of the callingUid instead of the calling package" into udc-dev am: 54ee76b649
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226833

Change-Id: I81c8a012a24619ecae995394561022a79fb28ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:48:10 -08:00
Pierre Barbier de Reuille
a85577054b Desktop Experience needs the device to be eligible
The Desktop Experience is only available (and therefore the freeform on
secondary display disabled) if the device is eligible for Desktop Mode.
Correcting the test to make it correct.

Fix: 393547201
Test: atest DesktopModeSecondaryDisplayPreferenceControllerTest
Flag: EXEMPT (bug fix)
Change-Id: I36a031487d8a6f6d681a2cb46a1fa50e47d870cc
2025-02-01 11:31:47 +00:00
Treehugger Robot
3d6aa9048e [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into udc-qpr-dev am: 6cd8230cbb -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 e719575e92 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226854

Change-Id: I9a760db5f4bc94e426d5294a79a10cba81c40def
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:25:45 -08:00
Fan Wu
00946da33f [automerger skipped] Check the permission of the callingUid instead of the calling package am: 201d7ffac4 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 e719575e92 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226854

Change-Id: I935567c7d2ed762cee8daab7dbcd893bc0f0736f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:25:40 -08:00
Treehugger Robot
f8c6feffe5 Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: Ibe53a373f1598632bd16c1e2659644d28bb1f11e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:24:32 -08:00
Treehugger Robot
78f62d8269 [automerger skipped] Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev am: b9c5239b5b -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830

Change-Id: I8e37a5fa6f1b917128963457f18046d8540476dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:24:23 -08:00
Fan Wu
81a5d7b696 [automerger skipped] Check the permission of the callingUid instead of the calling package am: 353cfc1b08 -s ours
am skip reason: Merged-In Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad with SHA-1 63656485ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226830

Change-Id: I98d55f743c385681f5a0d8d43dc516852c8a8cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:24:17 -08:00
Treehugger Robot
007a226ba9 Merge "Check the permission of the callingUid instead of the calling package" into tm-dev am: 969cb7728c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31226851

Change-Id: I7d226da8aef1c0823738324cd064c7ff96e0ecf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-01 03:24:14 -08:00
Treehugger Robot
54ee76b649 Merge "Check the permission of the callingUid instead of the calling package" into udc-dev 2025-02-01 03:09:33 -08:00
Treehugger Robot
b9c5239b5b Merge "Check the permission of the callingUid instead of the calling package" into tm-qpr-dev 2025-02-01 03:04:56 -08:00
Treehugger Robot
969cb7728c Merge "Check the permission of the callingUid instead of the calling package" into tm-dev 2025-02-01 03:01:34 -08:00
Treehugger Robot
6cd8230cbb Merge "Check the permission of the callingUid instead of the calling package" into udc-qpr-dev 2025-02-01 02:58:50 -08:00
Treehugger Robot
24fe6d9fe9 Merge "Revert "Use BatteryOptimizeUtils to add packageName into PowerSaveWhitelistUserApps allowlist, which will set app into Unrestricted Mode"" into main 2025-01-31 14:46:38 -08:00
Zhou Liu
8dc9b53328 Merge "Create "Change PIN" settings UI" into main 2025-01-31 14:13:12 -08:00
Matthew DeVore
dca3f94f12 Merge "Clip display blocks in the topology pane" into main 2025-01-31 12:28:11 -08:00
Zhou Liu
827d662460 Create "Change PIN" settings UI
Test: atest SupervisionChangePinPreferenceTest
Test: manually on real device
Bug: 393193125
Flag: android.app.supervision.flags.enable_supervision_settings_screen
Change-Id: I9a9af5d502c45a7710bcb73455eae9a828f0f721
2025-01-31 20:26:53 +00:00
Treehugger Robot
9e51bf40ac [automerger skipped] Merge "Allow system services to be optional" into main am: 55b0bcd8cb am: 184aee6710 -s ours
am skip reason: Merged-In I761054caebe3e846f5c6c76e2818662aad2cb511 with SHA-1 5a594828d7 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3462915

Change-Id: Iac2445a670d7304bb58d1eba47b1d433ce6c9955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-31 11:09:20 -08:00
Treehugger Robot
184aee6710 Merge "Allow system services to be optional" into main am: 55b0bcd8cb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3462915

Change-Id: I65cc32fb79196054fb4115722b04771425368d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-31 10:46:07 -08:00
Matthew DeVore
d73552fca5 Merge "Simplify pane sizing and scaling algorithm" into main 2025-01-31 10:30:40 -08:00
Treehugger Robot
55b0bcd8cb Merge "Allow system services to be optional" into main 2025-01-31 10:04:14 -08:00
Treehugger Robot
089ce7465d Merge "Flag cleanup in Settings: keyboard_layout_preview_flag" into main 2025-01-31 09:02:36 -08:00