Bill Yi
10d2cc00fb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39dcf7b2af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15390121
Change-Id: I027ddc12439243cfe1041607d7082d3231307a90
2021-07-27 06:20:10 +00:00
Bill Yi
39dcf7b2af
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I679b7a76538b3e94f2d564bacb6d8db4462d5717
2021-07-27 03:42:49 +00:00
Peter Kalauskas
82f54ab85d
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
am: 6804d23658
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: If357e1ed1924ea52530d2ed5de363469f99b85ec
2021-07-26 15:23:41 +00:00
Peter Kalauskas
3a8d2b2fef
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
am: 3f3c7b7762
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: If85253c1d6ed28e12cf3f8156e83c6f8eb7c14d4
2021-07-26 15:19:27 +00:00
Peter Kalauskas
6804d23658
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: I72de49d2efd13e19160a5387bd7947e111e5aa27
2021-07-26 15:09:41 +00:00
Peter Kalauskas
3f3c7b7762
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: I6084b5f8ec7e7a07afede1594d3a302974165c74
2021-07-26 15:07:10 +00:00
Peter Kalauskas
c9076d3d36
Merge "Fix: change owner name when account setup" into sc-dev
2021-07-26 14:52:29 +00:00
TreeHugger Robot
7303f135f9
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
am: 7364b38193
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I9597670776e93d68ca062e9e934b5a5c93460dac
2021-07-24 19:12:42 +00:00
TreeHugger Robot
923b048d73
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
am: 7993875a8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: Iedd478cd368b79d2bc1c409da28cbf20ca9bafc7
2021-07-24 19:11:53 +00:00
TreeHugger Robot
7993875a8e
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I29147e9d2400dbdccde9c63f15deb79240a2dd66
2021-07-24 19:00:27 +00:00
TreeHugger Robot
7364b38193
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I3979eea6816ff8f6cf37f698b6015f87b4b0d4e9
2021-07-24 18:58:49 +00:00
TreeHugger Robot
ae23247270
Merge "Use correct user ID for face bypass pref controller" into sc-dev
2021-07-24 18:46:18 +00:00
Curtis Belmonte
43f2be2059
Use correct user ID for face bypass pref controller
...
Ensures that the lockscreen bypass preference toggle shown on the face
unlock settings screen always uses the correct user ID. This fixes an
issue where the preference toggle for a guest user would use the
primary user's setting when multiple biometrics are supported.
Test: Manual:
1. Turn on Settings > System > Multiple users > Use multiple users
2. Add a guest account and switch to it
3. Enroll a face for Face Unlock on the guest account
4. From the Face Unlock settings screen, toggle "Skip lock screen"
5. Ensure that face bypasses lock screen iff this toggle is on
6. Switch back to the owner account and repeat steps 3-5
Fixes: 193488905
Change-Id: I2da4ce466fe0446cccc9119c90bd322daf627339
2021-07-24 09:20:08 -07:00
Tom Hsu
82a0d44bc4
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
am: 50cacb7ef4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: I740ea44f427047f1b8bd2a682f66b58ff91513f7
2021-07-24 06:59:48 +00:00
Tom Hsu
b114cda66f
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
am: 10af4a87fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: If1f5f714eee5f7461033c94ffc7b3c5d3abb42a8
2021-07-24 06:54:47 +00:00
Tom Hsu
50cacb7ef4
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: I96fa216a724ac84aeb9f8eba05c1d709fc9e701d
2021-07-24 06:42:40 +00:00
Tom Hsu
10af4a87fb
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: Ie33f9ae9cb7dfe13562b67010a8b56cf8941a288
2021-07-24 06:41:01 +00:00
Tom Hsu
d3d3161695
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev
2021-07-24 06:32:37 +00:00
tom hsu
01f43ff290
[Settings] Fix problem that MobileNetworkActivity show wrong Info.
...
- UiccSlotInfo only provide current active slots. It doesn't provide
inactive slot. Thus,it should not use it for checking sim existed.
Bug: 194022251
Bug: 194378040
Test: Maunal test
Change-Id: I00a3fcf3f700bee804bad12039d6d13a1404cc74
2021-07-24 05:34:07 +00:00
TreeHugger Robot
53c5eaa459
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fea4293f48
-s ours am: 2308651946
-s ours am: 9e9c9abad7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15378000
Change-Id: I570f725b7a09efbe17e10fa26c6df39580a90b1d
2021-07-24 02:44:52 +00:00
Bill Yi
f02852b3bf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a14938cc27
-s ours am: 9de075b836
-s ours am: aa1a97f80b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375146
Change-Id: Ibc53f8bf4f8f41721c8aaea4ec22182c28d380e6
2021-07-24 02:44:48 +00:00
TreeHugger Robot
cab4d77dba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: aee1431fd1
-s ours am: e34a6626b3
-s ours am: 231062e17d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379611
Change-Id: I79125a0c22380377f0742f35625e15c1098678bf
2021-07-24 02:44:45 +00:00
Bill Yi
56754090b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3da976f8b6
-s ours am: 4fa6d75375
-s ours am: db6ade8812
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375149
Change-Id: I76eb629be9e4d349e35ba049bfb9d96d61838433
2021-07-24 02:44:41 +00:00
TreeHugger Robot
b1dc25cc5a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fea4293f48
-s ours am: 2308651946
-s ours am: dfd6de3b5c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15378000
Change-Id: Idfe23a4c202d0fc66a6b0a7006c953e88f88c6db
2021-07-24 02:40:37 +00:00
Bill Yi
12ca57f7d5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a14938cc27
-s ours am: 9de075b836
-s ours am: a29cd257d8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375146
Change-Id: I5c4a458ddcf73bb50c730cde8bc5370b6258f239
2021-07-24 02:40:33 +00:00
TreeHugger Robot
596064c104
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: aee1431fd1
-s ours am: e34a6626b3
-s ours am: a0bb0ff019
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379611
Change-Id: I4dc9b9887f8efc1bc10cff304d88ad660693dcc7
2021-07-24 02:40:27 +00:00
Bill Yi
f418dbc6ed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3da976f8b6
-s ours am: 4fa6d75375
-s ours am: 7da3c35dbc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375149
Change-Id: Ie72a8e1613d38672273a206ab8243cf9e4eeacb3
2021-07-24 02:40:20 +00:00
TreeHugger Robot
349d8dff7c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7dd70398eb
-s ours am: 7c90f57be4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379614
Change-Id: I714b721785c18ad86aad9a77e4d1e0a5717a0797
2021-07-24 02:40:13 +00:00
TreeHugger Robot
9e9c9abad7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fea4293f48
-s ours am: 2308651946
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15378000
Change-Id: Ie53dfcbeeb6b72e15a39366883c042ee4e018dfa
2021-07-24 02:40:01 +00:00
TreeHugger Robot
f15268536c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bfd21817e8
-s ours am: 0d3f23e0bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379618
Change-Id: If3b6fcc1d6ca30accf363678d52d7a16f7468278
2021-07-24 02:39:57 +00:00
Bill Yi
aa1a97f80b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a14938cc27
-s ours am: 9de075b836
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375146
Change-Id: I8fa80d1ba4a6882f8e2fbedf7d1b7dfd39f3524e
2021-07-24 02:39:55 +00:00
TreeHugger Robot
231062e17d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: aee1431fd1
-s ours am: e34a6626b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379611
Change-Id: I62b07f694fdae07acb505441db17c3f5431e4daa
2021-07-24 02:39:50 +00:00
Bill Yi
db6ade8812
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3da976f8b6
-s ours am: 4fa6d75375
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375149
Change-Id: Ifd2499ac3efb3faafdb31eb3a6379ac347a99d7c
2021-07-24 02:39:44 +00:00
TreeHugger Robot
030df64861
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7dd70398eb
-s ours am: ef50a1ed15
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379614
Change-Id: I225797a9d07f2c29f9f7612632878ba48403c8f0
2021-07-24 02:39:05 +00:00
TreeHugger Robot
dfd6de3b5c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fea4293f48
-s ours am: 2308651946
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15378000
Change-Id: I557a0eb3ffbd9a266d5457c33b0e888c7a27bf69
2021-07-24 02:38:57 +00:00
TreeHugger Robot
b9ba302c9a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bfd21817e8
-s ours am: 39f0224620
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379618
Change-Id: I3b8ffec0677e411c900ad346308f07050cec05c9
2021-07-24 02:38:57 +00:00
Bill Yi
a29cd257d8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a14938cc27
-s ours am: 9de075b836
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375146
Change-Id: Ib449ed3fcdb414329d867c9580407a7c19e0c6d2
2021-07-24 02:38:53 +00:00
TreeHugger Robot
a0bb0ff019
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: aee1431fd1
-s ours am: e34a6626b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379611
Change-Id: I48c4bd7985c0082e70c9d9c107cc9ce3c03f1a88
2021-07-24 02:38:43 +00:00
Bill Yi
7da3c35dbc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3da976f8b6
-s ours am: 4fa6d75375
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375149
Change-Id: Icc4541f20f9c555b81b88b14d9b6f8322838bf02
2021-07-24 02:38:25 +00:00
TreeHugger Robot
2308651946
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fea4293f48
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15378000
Change-Id: I2e8dcd75f5d6131f42de5a5146b42a6fe943c4cc
2021-07-24 02:33:32 +00:00
Bill Yi
9de075b836
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a14938cc27
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375146
Change-Id: I64d1291ce7b0b692ae03a7e2089224de4f0b4268
2021-07-24 02:32:55 +00:00
TreeHugger Robot
e34a6626b3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: aee1431fd1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379611
Change-Id: I1d8d1b53b5e7fad1e7d75f3c3be612932147feaa
2021-07-24 02:26:29 +00:00
Bill Yi
4fa6d75375
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3da976f8b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375149
Change-Id: I25a4f07d88a0a992468a3455853e3fc93b088958
2021-07-24 02:26:22 +00:00
TreeHugger Robot
fea4293f48
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-07-24 02:23:43 +00:00
TreeHugger Robot
ef50a1ed15
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7dd70398eb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379614
Change-Id: I58ad1c782f5a1f4b9e6a534b633e67412cf7b8f5
2021-07-24 02:22:23 +00:00
TreeHugger Robot
39f0224620
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bfd21817e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379618
Change-Id: I215a194a434dad1e7442c4fe9471bf0e525d65c5
2021-07-24 02:22:17 +00:00
TreeHugger Robot
7c90f57be4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7dd70398eb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379614
Change-Id: Ie87377a764b27fd5bef2900fed2cce37d2ca06be
2021-07-24 02:20:38 +00:00
TreeHugger Robot
0d3f23e0bb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bfd21817e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379618
Change-Id: I930a6aaa333ce899a0e269b16867dcafe01a7f10
2021-07-24 02:20:29 +00:00
TreeHugger Robot
aee1431fd1
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-07-24 02:18:54 +00:00
TreeHugger Robot
4fade72b72
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 338a96e830
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379615
Change-Id: Icd0588d6c67e97773c8e9b6414b059f6efa821ea
2021-07-24 02:14:58 +00:00