Treehugger Robot
cc28c27eaa
[automerger skipped] Merge "[Settings] Ignore failed test case" am: c4cc279a2a
am: c4ece27bbb
am: 6568442e9c
-s ours
...
am skip reason: Merged-In I44ac801ccbd1de0aff7a69534131919e9ef1e732 with SHA-1 6c7ddebcc8
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019376
Change-Id: I67ded21fee031ed32714b9bb907d39b973dec07c
2022-03-11 21:08:14 +00:00
Bidhya
c697af1787
Remove developer option for bluetooth Gabeldorche
...
Bug:220175020
Test: Manually verified
Change-Id: I3c37228f7142892f2eb45552f2aced51360651af
2022-03-11 20:56:03 +00:00
Treehugger Robot
6568442e9c
Merge "[Settings] Ignore failed test case" am: c4cc279a2a
am: c4ece27bbb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019376
Change-Id: I3b349e7f8fbda088906e3419d1fee4b5a6882d69
2022-03-11 20:47:14 +00:00
Treehugger Robot
c4ece27bbb
Merge "[Settings] Ignore failed test case" am: c4cc279a2a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019376
Change-Id: Ic9a3e4cb3713df80b4fd431a3fb3f00cb0b13db5
2022-03-11 20:26:19 +00:00
Treehugger Robot
c4cc279a2a
Merge "[Settings] Ignore failed test case"
2022-03-11 20:11:39 +00:00
Bonian Chen
f6124ea5b9
[Settings] Ignore failed test case
...
Ignore failed test case.
Bug: 201021075
Test: build pass
Change-Id: I44ac801ccbd1de0aff7a69534131919e9ef1e732
Merged-In: I44ac801ccbd1de0aff7a69534131919e9ef1e732
2022-03-11 19:08:59 +00:00
SongFerng Wang
02bd57998d
Merge "[MEP] sort the simSlotMapping by logcal slot id" into tm-dev am: faa0eddcc7
am: 8fe3e9c38d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17159743
Change-Id: I306fdf81065d239b8d4c2154d8b2d597f053b769
2022-03-11 08:29:15 +00:00
SongFerng Wang
e742684bba
Merge "[MEP] sort the simSlotMapping by logcal slot id" into tm-dev am: faa0eddcc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17159743
Change-Id: Iff7f806c02ad6a4413f9a98eb7db93691debe0c3
2022-03-11 07:55:42 +00:00
SongFerng Wang
8fe3e9c38d
Merge "[MEP] sort the simSlotMapping by logcal slot id" into tm-dev am: faa0eddcc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17159743
Change-Id: Ia0e7a51b13b3247a293855a220f3f70d5ff50394
2022-03-11 07:54:24 +00:00
SongFerng Wang
faa0eddcc7
Merge "[MEP] sort the simSlotMapping by logcal slot id" into tm-dev
2022-03-11 07:31:56 +00:00
Joshua Mccloskey
335edbf89d
Merge "Allow deferred SUW to add multiple fingerprints" into tm-dev am: c724e0594a
am: c14c949ae9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129985
Change-Id: I7aa4ca1b6fee7ca31a11b19ebc3bb20183e30df4
2022-03-11 03:52:19 +00:00
Joshua Mccloskey
c14c949ae9
Merge "Allow deferred SUW to add multiple fingerprints" into tm-dev am: c724e0594a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129985
Change-Id: I14dae5082d53528bd5ca22f8e5a7302513969245
2022-03-11 03:30:30 +00:00
Joshua Mccloskey
8ef158fcd3
Merge "Allow deferred SUW to add multiple fingerprints" into tm-dev am: c724e0594a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129985
Change-Id: I699e92b5cf186c0fe0ded9a22b7288733ec804b9
2022-03-11 03:29:47 +00:00
Joshua Mccloskey
c724e0594a
Merge "Allow deferred SUW to add multiple fingerprints" into tm-dev
2022-03-11 03:11:10 +00:00
PETER LIANG
fdbcc58e01
Merge "Change the metric category of "Display size and text" in SuW." into tm-dev am: 0e2cb579b7
am: c9f69961cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17148788
Change-Id: I9c3dba1923eabf1a70188458b42dea347d486827
2022-03-11 01:56:39 +00:00
PETER LIANG
ea4be02e0a
Merge "Change the metric category of "Display size and text" in SuW." into tm-dev am: 0e2cb579b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17148788
Change-Id: Icb12f3e78cc85b5b014422ef689db11f71214e93
2022-03-11 01:33:10 +00:00
PETER LIANG
c9f69961cb
Merge "Change the metric category of "Display size and text" in SuW." into tm-dev am: 0e2cb579b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17148788
Change-Id: Ice47070be2d48bf62ebbbf5079a365b61ec48278
2022-03-11 01:32:48 +00:00
PETER LIANG
0e2cb579b7
Merge "Change the metric category of "Display size and text" in SuW." into tm-dev
2022-03-11 01:13:57 +00:00
Alice Kuo
7d56faf46a
Add LE audio hardware offload development option
...
Bug: 197296692
Bug: 215492586
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothA2dpHwOffloadPreferenceControllerTest
Change-Id: If1203c50d1d94ac9ed377293b5cb389b7b6f54a1
2022-03-11 07:45:54 +08:00
Menghan Li
04c9bf9025
Merge "Update accessibility button and gesture footer text for usability" into tm-dev am: b83759322b
am: 8a403666b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17119799
Change-Id: I5491868d99fb719ee0f62e8a247ba5e3508a1834
2022-03-10 23:20:08 +00:00
Joshua Mccloskey
66095680b2
Allow deferred SUW to add multiple fingerprints
...
Test: Verified that I could add extra fingerprints in deferred
SUW.
Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollIntroductionTest
Fixes: 204846146
Fixes: 223722376
Change-Id: Ib3fc31131e97f13512783ca2bab9d205da3a4044
2022-03-10 23:02:13 +00:00
Menghan Li
31bc4b1312
Merge "Update accessibility button and gesture footer text for usability" into tm-dev am: b83759322b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17119799
Change-Id: I7316054dae7b2c8ed94beff0ea3ac0e15ebd5e03
2022-03-10 22:56:39 +00:00
Menghan Li
8a403666b7
Merge "Update accessibility button and gesture footer text for usability" into tm-dev am: b83759322b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17119799
Change-Id: Ib542ffcba9daef1a7f7210210ac89c3efbe59527
2022-03-10 22:56:30 +00:00
Menghan Li
b83759322b
Merge "Update accessibility button and gesture footer text for usability" into tm-dev
2022-03-10 22:38:01 +00:00
Corina Grigoras
770cbdb00a
Merge "Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES" into tm-dev am: f2c1c97edc
am: 3b4b590e52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17149237
Change-Id: I09b188444279f45bc8e640882a25f980f974ef20
2022-03-10 22:35:32 +00:00
Corina Grigoras
5a1f4f2de3
Merge "Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES" into tm-dev am: f2c1c97edc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17149237
Change-Id: I89ebb3f7b4fa8f59c8e3133004b826c35d339c6e
2022-03-10 22:03:21 +00:00
Corina Grigoras
3b4b590e52
Merge "Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES" into tm-dev am: f2c1c97edc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17149237
Change-Id: I702d7c0d1066ae822bc6a7109a5de1dd9bdc7078
2022-03-10 22:03:04 +00:00
TreeHugger Robot
6ac83540c5
Merge "Fix WhenToDreamPreferenceControllerTest" into tm-dev am: fdd48399d9
am: 53e410b4e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17158224
Change-Id: I7cdbb646a1d9479c422e5bf0f1a361b1a4bec5b0
2022-03-10 21:36:41 +00:00
Corina Grigoras
f2c1c97edc
Merge "Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES" into tm-dev
2022-03-10 21:36:38 +00:00
TreeHugger Robot
6fe18b04b0
Merge "Fix WhenToDreamPreferenceControllerTest" into tm-dev am: fdd48399d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17158224
Change-Id: I57f6fb3d333c333f8ce1b031222f976d5b9593c2
2022-03-10 21:23:25 +00:00
TreeHugger Robot
53e410b4e9
Merge "Fix WhenToDreamPreferenceControllerTest" into tm-dev am: fdd48399d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17158224
Change-Id: I613c7a2508544a7aa7e5f5783e4a6bf70a439a25
2022-03-10 21:12:30 +00:00
TreeHugger Robot
fdd48399d9
Merge "Fix WhenToDreamPreferenceControllerTest" into tm-dev
2022-03-10 20:54:28 +00:00
TreeHugger Robot
f65a2e1199
Merge "Show lock icon in restricted settings dialog" into tm-dev am: 48eb6726c3
am: 21ffd376fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17140467
Change-Id: I04a035bc7cca2d4bc4741847d6f366c7ee97108c
2022-03-10 20:30:14 +00:00
Marie Matheson
21ac5e7d94
Merge "Bug fix - when enrolled, biometrics have ok safety state." into tm-dev am: 0b82bf9df3
am: 8bb49c90cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17142588
Change-Id: Ic6c1efe682ed768994f189cc7cbaea99d972de27
2022-03-10 20:28:14 +00:00
Ricky Wai
7e2a295b1b
Merge "Apply restricted settings to notification access." into tm-dev am: 6840252c11
am: e1c3fce993
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17140466
Change-Id: I64be205b79629f5d9e809369469c0734f56160c0
2022-03-10 20:12:04 +00:00
SongFerngWang
506c3df5b9
[MEP] sort the simSlotMapping by logcal slot id
...
The modem assign the simSlotMapping like UiccSlotMapping[
(mPortIndex=0, mPhysicalSlotIndex=0, mLogicalSlotIndex=1),
UiccSlotMapping (mPortIndex=1, mPhysicalSlotIndex=0,
mLogicalSlotIndex=0)]. The settings replace the first one
UiccSlotMapping when user insert psim and the both of esim
profile are not enabled. It is not correct. The root cause is that
the settings did not sort the simSlotMapping by logcal slot id.
Bug: 223662007
Test: atest UiccSlotUtilTest (PASS)
Change-Id: I6871db6c2d8d7b9f3cb334bb5cd2c7978b5b3b85
2022-03-11 02:58:55 +08:00
Lucas Silva
b418d4272f
Fix WhenToDreamPreferenceControllerTest
...
The current test uses a mock context, which doesn't support all the
methods being used. Instead, switch to using a real context.
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.WhenToDreamPreferenceControllerTest"
Bug: 216036457
Change-Id: Ib431d27943a8a732da1ef2dfad2eb1ce7ede36c2
2022-03-10 13:49:47 -05:00
TreeHugger Robot
21ffd376fa
Merge "Show lock icon in restricted settings dialog" into tm-dev am: 48eb6726c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17140467
Change-Id: I939ee3e421eaa700261a59f37bb5974c078706dd
2022-03-10 18:10:30 +00:00
Marie Matheson
8bb49c90cc
Merge "Bug fix - when enrolled, biometrics have ok safety state." into tm-dev am: 0b82bf9df3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17142588
Change-Id: I402bd68845db5aefddffb387181fdadf0707798b
2022-03-10 18:01:25 +00:00
Ricky Wai
e1c3fce993
Merge "Apply restricted settings to notification access." into tm-dev am: 6840252c11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17140466
Change-Id: I068649b895f6c632919d6b299c51f4b96dc24909
2022-03-10 17:56:46 +00:00
TreeHugger Robot
48eb6726c3
Merge "Show lock icon in restricted settings dialog" into tm-dev
2022-03-10 16:38:09 +00:00
Marie Matheson
0b82bf9df3
Merge "Bug fix - when enrolled, biometrics have ok safety state." into tm-dev
2022-03-10 13:40:54 +00:00
Patrick Rohr
40ebbb17cf
Add ingress rate limit to developer settings
...
Test: make -j64 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.development.IngressRateLimitPreferenceControllerTest"
Bug: 157552970
Bug: 122993151
Change-Id: I0d0aa40610016c1f9e94596cfe3ed6c9a0614d89
Merged-In: I0d0aa40610016c1f9e94596cfe3ed6c9a0614d89
(cherry picked from commit b0e5e84d49
)
2022-03-10 13:16:25 +00:00
Patrick Rohr
3fe8175bcd
Merge "Add ingress rate limit to developer settings"
2022-03-10 13:11:33 +00:00
Tom Hsu
76147437bf
Merge "[Panlingual] Revamp the panlingual UI in Settings."
2022-03-10 13:06:47 +00:00
Les Lee
d6b5a04ca1
Merge "wifi setting: Add psk length check" into tm-dev am: 4801983e1f
am: b55282a2f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17130190
Change-Id: I0335b73992c96901a2a7174369baca86199dc2b2
2022-03-10 12:32:07 +00:00
Ricky Wai
6840252c11
Merge "Apply restricted settings to notification access." into tm-dev
2022-03-10 12:04:49 +00:00
Les Lee
5353d3462c
Merge "wifi setting: Add psk length check" into tm-dev am: 4801983e1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17130190
Change-Id: Ie5ac9db46431671170110909bbcdf84dac13bebd
2022-03-10 11:59:24 +00:00
Les Lee
b55282a2f6
Merge "wifi setting: Add psk length check" into tm-dev am: 4801983e1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17130190
Change-Id: I4532d9a8b28012ac97ac60fdf8d0a21466003e9a
2022-03-10 11:58:27 +00:00
Les Lee
4801983e1f
Merge "wifi setting: Add psk length check" into tm-dev
2022-03-10 11:28:43 +00:00