Commit Graph

146361 Commits

Author SHA1 Message Date
Matías Hernández
3b3697d704 [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into udc-dev am: 4a584df0c4 am: a434120410 -s ours
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 e0510a62eb is already in history

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

Change-Id: I737be4e20e8eb74659aa74cf13349334bfe14264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 03:47:46 -08:00
Matías Hernández
dbf59af214 Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31189727

Change-Id: Ic9cbc10ea435cff9c5eb7b35b38257c868ce0b49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 03:36:07 -08:00
Matías Hernández
c2c7c0d984 Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31189727

Change-Id: I7234cc71c93f69f44b8d05bee2169cf297064ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 03:35:54 -08:00
Matías Hernández
a434120410 Merge "Remove incorrect call to Window.addFlags with a system flag" into udc-dev am: 4a584df0c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31172435

Change-Id: Ieb627204dbc2bfb48e665c7c5850bb30b591bac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 03:25:07 -08:00
Matías Hernández
04cbe370a1 Merge "Remove incorrect call to Window.addFlags with a system flag" into udc-dev am: 4a584df0c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31172435

Change-Id: I0f51099793d0e2bece4989e59583533191f6a561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-03 03:23:22 -08:00
Matías Hernández
98fc4f2356 Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev 2025-02-03 03:10:38 -08:00
Matías Hernández
4a584df0c4 Merge "Remove incorrect call to Window.addFlags with a system flag" into udc-dev 2025-02-03 02:57:39 -08:00
Weng Su
19bc8e0b86 Fix NPE issue in Internet Settings
- Ignore onWifiEntriesChanged callback when Activity does not exist

Bug: 389552565
Flag: EXEMPT bugfix
Test: Manual testing
atest -c NetworkProviderSettingsTest

Change-Id: I031043616f7c38d4bb27aa81ae3a0a0a32991c62
2025-02-03 18:40:47 +08:00
Jacky Wang
39444b4597 [Catalyst] Include tags into preference service response
Bug: 388061003
Flag: com.android.settings.flags.catalyst
Test: N/A
Change-Id: I59045d61d06bcec532ec4dc66b3362dae3689c4c
2025-02-03 17:45:31 +08:00
Zoey Chen
cb071420a6 Merge "[Settings] Create new fragment for app language" into main 2025-02-03 00:54:39 -08:00
Zoey Chen
7bfa672408 Merge "[Settings] Update the locale to framework after user select a new language" into main 2025-02-02 23:25:53 -08:00
Allen Su
caf664cd60 Fix unnecessary dialog
Bug: 388426025
Test: UI verification
Flag: com.android.settings.flags.regional_preferences_api_enabled
Change-Id: Ie4adff23b5b2fc26ef97478f6732eb300d088bd7
2025-02-03 07:13:41 +00:00
Shawn Lin
7c3559d37f Provide a way to customize biometric SafetySourceIssue
Add a new FeatureProvider for biometrics in FeatureFactory to provide a way to customize biometric SafetySourceIssue

Bug: 370940762
Test: m Settings
Test: m SettingsGoogle
Test: m SettingsSpaUnitTests
Test: m SettingsRoboTests
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: I4d11f3d3522ce5ac2f975cca7c041339f3ea6031
2025-02-02 18:46:25 -08:00
Sunny Shao
ea9855d17b [E2E] Update the Settings Homepage for new E2E rule
This windowOptOutEdgeToEdgeEnforcement attribute doesn't support in 25Q2.
Modify Settings Homepage to apply new rule of the Edge-to-Edge.

Test: manual test
Bug: 333998128
Flag: EXEMPT bugfix
Change-Id: Idd3bbc94813d35044814115a7ece6f1787095f67
2025-02-02 08:30:22 +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