TreeHugger Robot
a1ec33b820
Merge "FPSettings depends on SensorProps for maxEnrolls" into tm-dev am: b65ba00903
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17143748
Change-Id: Ic46862ae900c1a54654468567d6baac6b3f71256
2022-03-14 22:39:06 +00:00
TreeHugger Robot
b65ba00903
Merge "FPSettings depends on SensorProps for maxEnrolls" into tm-dev
2022-03-14 22:13:56 +00:00
TreeHugger Robot
5c6e8e42ef
Merge "Export battery usage data for EBS essential list filter mechanism" into tm-dev am: 34d3f79fe5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17180633
Change-Id: I1bf7b0d6e179c94e1e5ab74705e3383f10c86da4
2022-03-14 12:31:32 +00:00
TreeHugger Robot
34d3f79fe5
Merge "Export battery usage data for EBS essential list filter mechanism" into tm-dev
2022-03-14 12:04:03 +00:00
ykhung
93a4ef67c4
Export battery usage data for EBS essential list filter mechanism
...
Bug: 207471193
Test: make RunSettingsRoboTests
Change-Id: I0003bbfce7428e92a2a0e144903d72fc51804dbb
2022-03-14 17:34:50 +08:00
TreeHugger Robot
831b5f7ef7
Merge "Provide getBatteryLast24HrUsageData() method for application info" into tm-dev am: b527497438
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17180744
Change-Id: I562102e1e104004881653eb63ed9253168cb40e3
2022-03-14 08:12:07 +00:00
TreeHugger Robot
9a5b90c67f
Merge "Add ingress rate limit to developer settings" into tm-dev am: d328f73ec5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17126083
Change-Id: Idd79df6e16c4345c03e2832f65551ee327837536
2022-03-14 08:11:42 +00:00
TreeHugger Robot
b527497438
Merge "Provide getBatteryLast24HrUsageData() method for application info" into tm-dev
2022-03-14 07:54:52 +00:00
TreeHugger Robot
d328f73ec5
Merge "Add ingress rate limit to developer settings" into tm-dev
2022-03-14 07:53:33 +00:00
ykhung
ffba705f8d
Provide getBatteryLast24HrUsageData() method for application info
...
Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Iaa5f0c1bdead1a5380129f63987bbae3b4461633
2022-03-14 13:35:15 +08:00
Treehugger Robot
5786613dff
Merge "Remove developer option for bluetooth Gabeldorche" am: 4041027433 am: e9e158f469 am: abb0838f46 am: 6b985b365d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2012195
Change-Id: I146de3d8ae71371b4c3109281012c0f3a5ff35d0
2022-03-14 03:41:26 +00:00
Treehugger Robot
6b985b365d
Merge "Remove developer option for bluetooth Gabeldorche" am: 4041027433 am: e9e158f469 am: abb0838f46
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2012195
Change-Id: I3f15b8fea0f6ca4f51d07b3e8e97d249324444c4
2022-03-14 03:21:17 +00:00
Treehugger Robot
abb0838f46
Merge "Remove developer option for bluetooth Gabeldorche" am: 4041027433 am: e9e158f469
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2012195
Change-Id: Idbf038ee0d4e060d55cd2140b69ac3e49196a05e
2022-03-14 03:00:09 +00:00
TreeHugger Robot
65aad0d965
Merge "Add LE audio hardware offload development option" into tm-dev am: a5af8fef21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17100784
Change-Id: Ib8b9644edfe31685556074345d19b1598a61b2b8
2022-03-14 02:46:04 +00:00
Treehugger Robot
e9e158f469
Merge "Remove developer option for bluetooth Gabeldorche" am: 4041027433
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2012195
Change-Id: I77983e4a010ce777d22b918a0e34632c357283de
2022-03-14 02:36:44 +00:00
TreeHugger Robot
a5af8fef21
Merge "Add LE audio hardware offload development option" into tm-dev
2022-03-14 02:24:49 +00:00
Treehugger Robot
4041027433
Merge "Remove developer option for bluetooth Gabeldorche"
2022-03-14 02:06:39 +00:00
TreeHugger Robot
a9c742f3c8
Merge "Remove the extra line below context button" into tm-dev am: b8d6f84171
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17148793
Change-Id: I141151cc7a81e6ce6109f4fc95989e94fb558127
2022-03-13 23:07:50 +00:00
TreeHugger Robot
b8d6f84171
Merge "Remove the extra line below context button" into tm-dev
2022-03-13 22:46:03 +00:00
Treehugger Robot
bedf3b01a5
[automerger skipped] Merge "[Settings] Ignore failed test case" am: c4cc279a2a am: c4ece27bbb am: 6568442e9c -s ours am: cc28c27eaa -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: I423bd7349faf323987594602e0e1b45463278d44
2022-03-11 21:29:08 +00:00
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
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
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
c724e0594a
Merge "Allow deferred SUW to add multiple fingerprints" into tm-dev
2022-03-11 03:11: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
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
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
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
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
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
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
Ricky Wai
6840252c11
Merge "Apply restricted settings to notification access." into tm-dev
2022-03-10 12:04:49 +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