Zaiyue Xue
c27cd42a1f
[automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
-s ours am: 8cbeaf6a74
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: Ifaee7670c5ff5a0b2f4ba43418381e56a076d412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:24:23 +00:00
Zaiyue Xue
7bfd068d24
[automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc
-s ours am: d593cb5284
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I1887b1781d9f6232ee1403787175340a26142a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:24:20 +00:00
Treehugger Robot
f47dbe3bae
Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143
Change-Id: I2b65e858794346e3231bb7fdb0a013a2d4934677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:24:10 +00:00
Treehugger Robot
10abf2f63a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours am: 7e88b1ed07
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I582b7c8daa30334e77e4f3d29bd1c6b33223bf40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:06:57 +00:00
Bill Yi
ef7c503634
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours am: d0d5c9d84c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I2f452ce55a6fad205b0b45335a59b60d64c09a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:06:53 +00:00
Treehugger Robot
a411c734bb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours am: 7930f72c4d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Idbe8cf0ba06661a66dd9dce9cc29068ab7e560f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:06:46 +00:00
Bill Yi
ad194b0927
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours am: 7c2f3a4ba1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Icfab197e4900a1d3ee7538fdb17c20c91be8bdf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:06:27 +00:00
Treehugger Robot
1dfa0e78df
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours am: 7d610e7f85
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I483c7df647a3a7fc3b129c482a8b5ab36727f29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:06:01 +00:00
Bill Yi
211d2eb69a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours am: 94f17b981a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: Idae32d533f1de63ec852177471dbf4d35caacdcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:05:39 +00:00
Zaiyue Xue
7cf38b4f81
[automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
am: da62051efd
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I4107e4de3286498e46ff35e7cc1b4ff91b341545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:04:55 +00:00
Treehugger Robot
a7bcd85abc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I9265c468e88f95ec151313dc3aa0da59524fea74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:45:29 +00:00
Bill Yi
ee15b19128
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I29d3fab9f64bcf32fecb40fd58ba9185d2745f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:45:25 +00:00
Treehugger Robot
3ea3bb83ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ib907d72110fd8de7e50739dda333d3259f8e9c00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:45:18 +00:00
Bill Yi
0138ef4a5e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ibc41e61f678505434904b294eac1404b1eeaabb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:44:57 +00:00
Treehugger Robot
41bd0f8ae1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I8d1606d1e75be63eb1c242d059884d9245644843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:44:38 +00:00
Bill Yi
bd6c412717
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I2d75504f6080be8f1d31121e5d47541024b95f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:44:20 +00:00
Treehugger Robot
7e88b1ed07
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: Icd531ab1576b548a996d8f975d130eefb8a30360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:42:34 +00:00
Bill Yi
d0d5c9d84c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I87b24056f4a0d370634fe2ccc2237ea8045fddea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:42:25 +00:00
Treehugger Robot
7930f72c4d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: I850098c780abe7d600eee7243df0f033d387f1c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:42:18 +00:00
Bill Yi
7c2f3a4ba1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ibcd3f5106e8f6ca98315c92437b7a0179f1e66ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:55 +00:00
Zaiyue Xue
8cbeaf6a74
[automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: Iaff731be3b366c49eea5032d191218dd7abcdaab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:41 +00:00
Zaiyue Xue
d593cb5284
[automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I51cf1905b8ae5b97b24facedf343375c983f7b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:39 +00:00
Treehugger Robot
7d610e7f85
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I12b528b5410a96bf63d6fb645f12682e57e40b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:36 +00:00
Bill Yi
94f17b981a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I29ed00f4ef95520f1ebbe6ecdadf9eaa6d1432c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:19 +00:00
Zaiyue Xue
da62051efd
Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: Ie9e6621a39e30b5ba000e2bf6516719eea2a8fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:39:42 +00:00
Treehugger Robot
57522f0fcc
Merge "Shutdown secondary SAP automatically" into udc-d1-dev
2023-06-14 03:35:18 +00:00
Treehugger Robot
b8ddf4126c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-06-14 03:33:21 +00:00
Treehugger Robot
a505517090
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:32:14 +00:00
Treehugger Robot
c706f8544d
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:32:14 +00:00
Treehugger Robot
958690e3a5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:32:14 +00:00
Zaiyue Xue
8c25fe4c60
Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev
2023-06-14 03:01:25 +00:00
Weng Su
20fd4a46c8
Shutdown secondary SAP automatically
...
- If the "Extend compatibility" preference is not supported, then set to shutdown secondary SAP automatically within the "Turn off hotspot automatically" preference.
Bug: 285914977
Test: manual test
atest -c WifiTetherAutoOffPreferenceControllerTest
Change-Id: I405107a4782a6f023442d196d0fca27515aab00e
2023-06-14 05:51:43 +08:00
Wenhui Yang
e839945290
Merge "Fix face model delete message" into udc-d1-dev am: d56f96aaba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23677227
Change-Id: I147cb8b08941e5b56836c2d95456b605a2ed55f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 21:11:21 +00:00
Wenhui Yang
d56f96aaba
Merge "Fix face model delete message" into udc-d1-dev
2023-06-13 20:43:42 +00:00
Grace Cheng
f0614ef722
Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674
Change-Id: I6332c141e3bb13b49bbabfcfebc3e91b8a5faf8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 20:01:00 +00:00
Grace Cheng
f58714496a
Fix NPE in updateAddPreference
...
Update mAddFingerprintPreference to avoid NPE
Fixes: 286495189
Test: Rotate screen during first fingerprint enrollment, complete enrollment, and observe no crash
Change-Id: Id7edde492168b467360c6c99b326721cd883bba8
Merged-In: Id7edde492168b467360c6c99b326721cd883bba8
2023-06-13 19:23:04 +00:00
Grace Cheng
8ba960014c
Merge "Fix NPE in updateAddPreference" into udc-d1-dev
2023-06-13 19:22:55 +00:00
Bill Yi
25683d53c4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: 32b73cd4ea
-s ours am: fec819220b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I42f065234404c9ef6a5379172eb3be8ac5f51d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 19:00:10 +00:00
Bill Yi
c0c0c7cf5c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours am: c7d760438a
-s ours am: d152123a74
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: Ieb870030aaf1cd3354c2b20aa99f9c356e6878d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:58:13 +00:00
Bill Yi
88d7f8f441
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours am: c7d760438a
-s ours am: a8cf863944
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: Id208c14207c5e1d71e62fdbbdf26930c090ba899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:55:37 +00:00
Bill Yi
7c411855f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: c52befa925
-s ours am: a20c952bb6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I2f6fef157726b19b540457edbfd08c5b0e4f3588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:49:54 +00:00
Bill Yi
0aafcc81f4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: c52befa925
-s ours am: 60f3e2d53d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I4a3471957af3c76235929e9eb6da89ccb9fb7155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:49:10 +00:00
Bill Yi
fec819220b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: 32b73cd4ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: If4718b30ee626a955a2da4d2d577116cde5bd6d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:48:15 +00:00
Wenhui Yang
08d11518a8
Fix face model delete message
...
Add new strings for face model deletion when fingerprint unlock is available.
Test: Manual - test on devices and observe the error message is correct.
Fixes: 283122570
Change-Id: I0511e58d030b8b63391d8406bfc0447fe33fa9fc
(cherry picked from commit 5e71aee4cd
)
2023-06-13 18:37:26 +00:00
Bill Yi
d152123a74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours am: c7d760438a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I9b83f96b046054735004994bba24dba2b53c610f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:15:54 +00:00
Bill Yi
a20c952bb6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: c52befa925
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I2b1476f7e11814649388cc8c08c976b1bb1a643d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:15:33 +00:00
Bill Yi
a8cf863944
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours am: c7d760438a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I1714b84269a401d01b495d3f49f66e02503cddd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:12:49 +00:00
Bill Yi
60f3e2d53d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: c52befa925
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: Ic267c3e00a34a48e259821fff2849694b2133b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:12:28 +00:00
Bill Yi
c7d760438a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I31527b6935660fe76669f6d711beb978e55600b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:08:05 +00:00
Bill Yi
32b73cd4ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I5cc0f93640e97a83a96c3e37d1a891dd0dd82d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:04:11 +00:00