SongFerngWang
04e6e54503
[Setting crash] The dialog is null am: 8514ff65eb
am: c69ee75a64
am: d581334f58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: I6e2dc8f7459b56e7da7e839eeb8155787e8fabfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:58:51 +00:00
Automerger Merge Worker
955397f7ca
Merge "Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
am: 40379dd9d4" into tm-d1-dev-plus-aosp
2022-06-09 02:43:06 +00:00
SongFerng Wang
26e4bc3385
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
am: 40379dd9d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: I1e9704393a31afba4dc045b5f8a0cac01cc05e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:43:03 +00:00
SongFerng Wang
506f08b469
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
am: 8425062cef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: Ie02de937a62231f6bf41218ded791204046c59ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:43:01 +00:00
Automerger Merge Worker
d5bcf3fd1d
Merge "[Setting crash] The dialog is null am: 8514ff65eb
am: b6bd4143cd" into tm-d1-dev-plus-aosp
2022-06-09 02:42:57 +00:00
SongFerng Wang
cac60c3548
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
am: 8425062cef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: Iaf160129453409905112ff321ab35694c3383b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:42:56 +00:00
SongFerngWang
b8e8f9d524
[Setting crash] The dialog is null am: 8514ff65eb
am: c69ee75a64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: Ic8dd54e2aa27f8d62e872f0c73e13ea6ab953fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:42:53 +00:00
SongFerngWang
d0c7fd9edd
[Setting crash] The dialog is null am: 8514ff65eb
am: b6bd4143cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: I0b408ceccfb1fbe774750a1a4e8582226a0ce069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:42:52 +00:00
SongFerngWang
d581334f58
[Setting crash] The dialog is null am: 8514ff65eb
am: c69ee75a64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: Iba704f625707a2eb9e6ae90f648ce335c9201e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:42:49 +00:00
TreeHugger Robot
f700b7398c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-09 02:39:03 +00:00
TreeHugger Robot
8be819762f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-09 02:39:03 +00:00
SongFerng Wang
8425062cef
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: Ic113ffc982f64c332b5269275e47941d6d5c2245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:07:10 +00:00
SongFerngWang
c69ee75a64
[Setting crash] The dialog is null am: 8514ff65eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: Ib697f1fddcb8b77b36d2dc95cfa34331ded9bf14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:06:56 +00:00
SongFerng Wang
40379dd9d4
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: I6120361d42db676e02991dafd707dfa1b4188777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:05:41 +00:00
SongFerngWang
b6bd4143cd
[Setting crash] The dialog is null am: 8514ff65eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: Ie9e4e661bb66dcb898b2f98435989ab838d37713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:05:21 +00:00
SongFerng Wang
be1b37ae2b
Merge "Unable to enable the removable esim" into tm-dev
2022-06-09 01:30:44 +00:00
Joshua McCloskey
0eb278b245
Added consent message for FaceAuth enrollment.
...
Test: Manual.
Fixes: 234663447
Change-Id: Iefd9b10eb634ed271f57b82e2a40be08dbbc1f61
2022-06-08 22:02:19 +00:00
Bill Yi
d98e536863
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I650e4197e0aff594a172c01f04cffd4092b7467d
2022-06-08 14:12:47 -07:00
Bill Yi
fe71b2e76c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4111bd9a5feee6d6a8b5db7861d622ea893515e2
2022-06-08 14:08:50 -07:00
Joshua McCloskey
548f6f36c1
Add functionality to restart fp enrollment.
...
Test: Tested manually via SUW that restarting enrollment works
as expected.
Test: Tested manually via settings that restarting enrollment
works as expected.
Fixes: 234887288
Change-Id: I815392269da786d2dfd157267919a09281af6277
2022-06-08 21:00:59 +00:00
Joshua McCloskey
77452db3f9
Updated FP enroll confirmation string
...
Test: Verified correct string shows after FP enrollment.
Fixes: 234183906
Change-Id: I57e7ce836d4dc5ad2caf198aa59738f64dc4c049
2022-06-08 20:59:36 +00:00
SongFerngWang
8514ff65eb
[Setting crash] The dialog is null
...
Add the null protection.
Bug: 235267673
Test: build pass
Change-Id: Ib9308d152ddc233354d89166b8d79fcec81d8c19
2022-06-08 08:32:05 +00:00
Milton Wu
2069d2e17b
Update SUW fingerprint string
...
Bug: 228021544
Test: Check string in SUW flow
Change-Id: Id0729b7f2758e98d53484ffd35282c6423f82262
2022-06-08 07:12:24 +00:00
Automerger Merge Worker
1a935b1953
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours am: 537b47d74e
-s ours" into tm-d1-dev-plus-aosp am: 2775ad9caa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I3b7720ae178ab43f99349ed75368fdcf157e76ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:22:32 +00:00
Bill Yi
5e0ce2dca3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours am: 537b47d74e
-s ours am: 2b0376c226
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I2c8e880853e6f9cde41103f0a3a5945305a63977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:22:10 +00:00
Bill Yi
a1ae687480
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours am: 131903dd2e
-s ours am: 17fe543e54
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I89901a3b8ec9d062e0cbca00a8a48d52e172b362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:14:42 +00:00
Avinash Vadlamudi
1ed3556c63
Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev am: 26e3744221
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18751036
Change-Id: I1a0e8f88302132e700c9f07b802f44e412ceae1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:12:18 +00:00
Avinash Vadlamudi
26e3744221
Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev
...
* changes:
Rename method for better readability
Fix the Ephemeral guest mode UI bugs
2022-06-08 04:03:11 +00:00
Bill Yi
6d96a79850
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours am: 537b47d74e
-s ours am: c4a1f97025
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I48b082d485ba11bd56a8a469d1c430dcc392044f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 03:57:31 +00:00
Automerger Merge Worker
2775ad9caa
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours am: 537b47d74e
-s ours" into tm-d1-dev-plus-aosp
2022-06-08 03:50:41 +00:00
Bill Yi
2b0376c226
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours am: 537b47d74e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I3ce5bb254a6c4d9244c2f29c3a6ad59587438753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 03:48:49 +00:00
Bill Yi
17fe543e54
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours am: 131903dd2e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Ib4af0ce054ac96742875fcd2df1a28d163e691dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 03:48:41 +00:00
Bill Yi
c4a1f97025
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours am: 537b47d74e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Ic7cf3d05fe64e8e19bfc950365e3d210155a76dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 03:48:30 +00:00
Bill Yi
131903dd2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Icd6cc592217548df11b658f141d8dee124e99b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 02:46:47 +00:00
Bill Yi
537b47d74e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Ie56499fb898021c83535e0db7f0552c9400e7956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 02:46:43 +00:00
TreeHugger Robot
0b79b0831d
Merge "Restrict guest user to configure WiFi access points" into tm-qpr-dev am: 909b62ffa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740330
Change-Id: Ida08053974615bb1200e20b6f90ca0adbc79d4a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 18:36:21 +00:00
TreeHugger Robot
909b62ffa4
Merge "Restrict guest user to configure WiFi access points" into tm-qpr-dev
2022-06-07 18:16:32 +00:00
Bill Yi
e6b9e1fdf5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3cdc674297a6f760c146bfd95190496a88309055
2022-06-07 07:29:07 -07:00
Automerger Merge Worker
2a3e6630ae
Merge "Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 47b4c86524" into tm-d1-dev-plus-aosp am: 2de1730ca0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I33d0be2302813faf76949efdc869cdcb0eb7c296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:12:42 +00:00
Edgar Wang
65d4e5ffef
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 025baa318b
am: 0d22bf453d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I49d34f1b2f737217216096f0fbd9c6d6d46afb34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:12:33 +00:00
Edgar Wang
94a7906033
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 47b4c86524
am: 7ab5a44498
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I957fd8fde3ae1865148de0fdd7c6d32b9bb79217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:12:17 +00:00
Automerger Merge Worker
2de1730ca0
Merge "Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 47b4c86524" into tm-d1-dev-plus-aosp
2022-06-07 04:58:42 +00:00
Edgar Wang
0d22bf453d
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 025baa318b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I56e33ea1e76d0426f15816862464a81d36934848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:58:38 +00:00
Edgar Wang
f3883c5da8
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 47b4c86524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I264c15129aad5569e1d05e37940247c95ae4d07c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:58:38 +00:00
Edgar Wang
7ab5a44498
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
am: 47b4c86524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I3d2bdadb80d2a1189e8e7e69d883ac2f4763bbd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:58:36 +00:00
Edgar Wang
47b4c86524
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I0f6f87246effdc808b77726a0519d4b063ef4fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:41:48 +00:00
Edgar Wang
025baa318b
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I831063be158b5097e3cc82e8d5db767676096811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:40:14 +00:00
Edgar Wang
1f6334825f
Merge "Recalculate view's height when tab is selected" into tm-dev
2022-06-07 04:17:39 +00:00
Automerger Merge Worker
a1a0499242
Merge changes from topic "am-038a028ec25548ecafb51d7e14eb8cbf" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c
-s ours am: 02dead7892
-s ours
[automerger skipped] Grey out LE audio offload switcher as LE audio isn't enabled/supported am: b51ae97810
-s ours am: a6b2701416
-s ours
2022-06-07 04:15:20 +00:00
TreeHugger Robot
572cfb7640
[automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c
-s ours am: 02dead7892
-s ours
...
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333
Change-Id: I0b2c71b9fae7ed8417d0b696e41f80222d87f054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:15:15 +00:00