Weng Su
80de015a39
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I31bd3642eebb68a371bf56646f497ff05f58b3a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:35:12 +00:00
Weng Su
ff24b1049d
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours am: ae5606811f
-s ours am: d487a5f38d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I43243fb24399603dbb0c3a2059eb818d040feae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:33:09 +00:00
Weng Su
d091c49a5b
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: If458e770efd95aa86a030864d6fb12bba88a6447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:33:08 +00:00
Weng Su
f0736c4a01
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
am: 995a7a4b71
-s ours am: 464f9e07c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I19d3227710d27672eab5c6c616f1a20491f28753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:31:58 +00:00
Treehugger Robot
e7498073c0
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours am: a364f6475a
-s ours am: 96647238d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I861293d9885b5617e3dacb1150b82b8e41a4ee18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:53:58 +00:00
Weng Su
9448db4072
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05
-s ours am: 82c89c8ef7
-s ours am: ce242730ed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: If9a23e3f53713f2879b0aa674010620629c21ca2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:53:56 +00:00
Treehugger Robot
4a8d0625a1
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours am: a364f6475a
-s ours am: 1ad564b9b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: Ib1cc3b83d184ce352c3c5b486bede573afd17002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:53:00 +00:00
Weng Su
d76f85e08a
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05
-s ours am: 82c89c8ef7
-s ours am: 5bc1b45a85
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: Ib8175a659c33e122c1589f916692857c7f0f7dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:52:57 +00:00
Weng Su
464f9e07c8
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
am: 995a7a4b71
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I3093550d3785532c19daeb1cff3e4b46cc048b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:50:46 +00:00
Treehugger Robot
2e63a56624
[automerger skipped] Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
am: b48dfbbe86
-s ours
...
am skip reason: Merged-In Iecdbbff7e21dfb11e3ba385858747a220cfd3e04 with SHA-1 5a17d39db7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512
Change-Id: Ib6547db18ba92e07ab544b0b3386f266b8dc3251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:50:03 +00:00
Treehugger Robot
731c2462bc
Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
am: 57b00e28ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512
Change-Id: I699b21dd28e73c18945b4fecc6f3318b1cded128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:49:30 +00:00
Weng Su
2aa573fbd1
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I4454cf3c8cb00f2aa046123debde13d472b6fba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:48:02 +00:00
Weng Su
cb3ebcb4e3
[RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I9a94483eaa6693a50ee2d01264ad202721b80986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:45:45 +00:00
Weng Su
d487a5f38d
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours am: ae5606811f
-s ours
...
am skip reason: Merged-In I5cf984000244b4ad901c6a4977a1368279323e0a with SHA-1 8c6c1ca236
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I1f3a68c7b237832351a3b87a704a1095340fa9d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:44:20 +00:00
Treehugger Robot
96647238d2
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours am: a364f6475a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I5c02052cea553a59440c7b190b5cadd6ae437c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:05:10 +00:00
Weng Su
ce242730ed
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05
-s ours am: 82c89c8ef7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I4dd74a47a6214f98a59e247b6f2727fa7c19098b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:05:08 +00:00
Treehugger Robot
b48dfbbe86
Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512
Change-Id: Ia55ca6e477494e1e0ca3773c7a4df63ca2d59d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:04:58 +00:00
Weng Su
ae5606811f
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours
...
am skip reason: Merged-In I5cf984000244b4ad901c6a4977a1368279323e0a with SHA-1 8c6c1ca236
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: Ie6719f8ad85070e094ab685d16c65579cbc006b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:02:22 +00:00
Treehugger Robot
1ad564b9b9
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours am: a364f6475a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: Ia54e445885861ee810783414d67cf33074212339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:00:40 +00:00
Weng Su
5bc1b45a85
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05
-s ours am: 82c89c8ef7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I215f6bc431796c15ab3a71aed5d9894ea6050f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:00:38 +00:00
Weng Su
995a7a4b71
[RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I6730a2d19a398f2ae6fe585c617d9713205139a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:00:19 +00:00
Treehugger Robot
57b00e28ea
Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512
Change-Id: Ic052e568818d4829fe40250e00679742fc816263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 20:59:46 +00:00
Treehugger Robot
a364f6475a
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I657080d670e7149418757a7311b339d0d104863f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 20:35:29 +00:00
Weng Su
82c89c8ef7
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: Ic98d995f5949fd3cd19d5193afd17bb67f68d579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 20:35:23 +00:00
Wenhui Yang
d26f18f727
Revert "Fix rotate device at face unlock detailed page, device will display"
...
This reverts commit 2ca753bd06
.
Reason for revert: Fix b/289173795
Change-Id: Ieaabe550bcbaad21a2373f3c5c103c68739d45dc
2023-07-25 20:31:36 +00:00
Treehugger Robot
64c88a192a
Merge "Restrict ApnEditor settings" into udc-dev
2023-07-25 20:09:39 +00:00
Treehugger Robot
a88e1b6c73
Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev
2023-07-25 19:48:14 +00:00
Treehugger Robot
a439e611f9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I9d69d8978d412140ecf37fc0c96756ad12f95f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:30:12 +00:00
Bill Yi
7db67a8851
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47855826c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I6998be11d631b1a584327e477f690ef8c52b2182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:30:07 +00:00
Bill Yi
93b217da0f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b179a9a1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179284
Change-Id: Ieaa0b92c521914293cd766388890f3b46eb574e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:29:48 +00:00
Treehugger Robot
1a073f4f6c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-24 19:18:34 +00:00
Bill Yi
0b179a9a1c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If5cf9ebde62e0be58cacf65575d45f79c5cc1a79
2023-07-24 09:23:04 -07:00
Bill Yi
47855826c7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1927131129b72df309406cf5dfe3a37b7d94e71c
2023-07-24 09:20:40 -07:00
Treehugger Robot
b6d9a8bca0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90d628186c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153453
Change-Id: I0071372392b92c69b90c94ef022e5770040c4cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:51 +00:00
Bill Yi
aab0565203
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2819e72250
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153453
Change-Id: I64c7e86fbab7e5f70c882f31d13b9c80b0dedd6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:49 +00:00
Treehugger Robot
2987136500
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 22e1df0c7e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153452
Change-Id: Ic881ab86df2bc62398af7be3ef2b5480f5189e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:45 +00:00
Bill Yi
6eb9b90a08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9caafcc39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153452
Change-Id: I644e1687944d9d21392a350815a77da99043f11e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:41 +00:00
Treehugger Robot
64faf68d0b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d52951de52
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153451
Change-Id: Iaf7aa6ea9b9f6567a86fbe2ff8363c1f70da217f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:30 +00:00
Bill Yi
f7ef6eb13d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60714bfa6f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153451
Change-Id: Ie1de4c9dd549fe7cb161fc4598acf6aa1f3cdf9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:16 +00:00
Treehugger Robot
90d628186c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-22 01:35:20 +00:00
Treehugger Robot
22e1df0c7e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-22 01:35:20 +00:00
Treehugger Robot
d52951de52
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-22 01:35:20 +00:00
Wenhui Yang
eb94624bcd
Update learn more string for udfps fp settings am: c6c9d74f06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551
Change-Id: I92bc5389ab6346cbedcce6e76135067ec3a201a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 00:51:46 +00:00
Hideki Ishii
8bce735fa0
Match APN types with ignoring the case
...
Currently APN types which are set on ApnEditor are compared with the
types which are configured with read_only_apn_types_string_array in a
case-sensitive manner. So upper case types such as "DUN" or "IMS" can be
set if read_only_apn_types_string_array is configured as "dun" or "ims."
Then the APN with types such as "DUN" or "IMS" can be added and may be
used for the network connection unintentionally.
This patch compares APN types with ignoring the case on ApnEditor to
prevent the problem above.
Bug: 200194310
Test: Manual test passed
Change-Id: I0f68bf470699df388855ec7277c0cfc24a2c30ba
2023-07-21 15:49:02 +09:00
Wenhui Yang
c6c9d74f06
Update learn more string for udfps fp settings
...
Update the learn more message for udfps fingerprint unlock to make it
consistent with sdfps.
Fixes: 289167628
Test: manual (see bug)
Change-Id: Iac6edb1c176dab462c91e1bf6236dfe4d0988693
2023-07-21 02:36:24 +00:00
Bill Yi
2819e72250
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I24da05f824c241f76981357b5468d082899e1de7
2023-07-20 15:00:17 -07:00
Bill Yi
f9caafcc39
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I91e1b33c246709f423cb28de5c3924b66eafb843
2023-07-20 14:58:39 -07:00
Bill Yi
60714bfa6f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I55987bdb3e12aebb2cca8e928454c4411e92cc1d
2023-07-20 14:56:49 -07:00
Ken Lin
face5b6c2a
Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev am: a6f2464e8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24109923
Change-Id: I5554e3263baf46c64ba2286a80e5cb83da5d4098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 05:08:37 +00:00
Ken Lin
a6f2464e8c
Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev
2023-07-19 03:58:47 +00:00