tom hsu
34f3320955
[Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec
am: e21d27c5ef
am: d09cfbeb05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882
Change-Id: I2a27d2a8f9ff3e7736aaa24bca095a9c86da0b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 09:43:52 +00:00
tom hsu
d09cfbeb05
[Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec
am: e21d27c5ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882
Change-Id: I9ad25617fc2d6142c8455be78ac8118799ab505f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 09:36:12 +00:00
tom hsu
e21d27c5ef
[Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882
Change-Id: I61dc41ada82f1fbcba4c1b337681ebd3e4b47055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 08:54:36 +00:00
tom hsu
5216eeaaec
[Settings] Fix MMS message UI is no consistency between UI and real state.
...
Bug: 285253872
Bug: 281566495
Test: Manual test passed.
Change-Id: I805490fd5c4417e88c38a047f99ef626c16f600a
2023-06-13 06:01:25 +00:00
Rhed Jao
1c7c01adb8
Merge "Passing the writing repair mode password flag to verify credential api" into udc-qpr-dev am: cc1fe61339
am: 6856e809b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308384
Change-Id: I4e688e2034b1d33b141fb13a5383b7142b743901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 03:00:36 +00:00
Wenhui Yang
52d5bdc0c1
Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev am: bfa2feb316
am: 9ed0cee15f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23574345
Change-Id: Ib9580f0420fc4bd0de6b06234294af5c2feb8e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 02:59:29 +00:00
Wenhui Yang
4e059e6f4b
Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev am: 14b115177c
am: afa7bcb2e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23591204
Change-Id: I953acbc10670453878669fc3912c98bba4850470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 02:57:50 +00:00
Rhed Jao
6856e809b0
Merge "Passing the writing repair mode password flag to verify credential api" into udc-qpr-dev am: cc1fe61339
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308384
Change-Id: I8042bcbec114798b9fee18b76733944f99bd8c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 02:55:54 +00:00
Rhed Jao
cc1fe61339
Merge "Passing the writing repair mode password flag to verify credential api" into udc-qpr-dev
2023-06-13 02:14:22 +00:00
Wenhui Yang
9ed0cee15f
Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev am: bfa2feb316
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23574345
Change-Id: I1d258a5f739e9ed033bce431e6ea636f3772910a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 01:49:53 +00:00
Wenhui Yang
afa7bcb2e5
Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev am: 14b115177c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23591204
Change-Id: I6b745a87a4a20ca01bb55cc0a5e921c12f1fcc23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 01:48:41 +00:00
Wenhui Yang
bfa2feb316
Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev
2023-06-13 01:02:42 +00:00
Wenhui Yang
14b115177c
Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev
2023-06-13 01:02:08 +00:00
Treehugger Robot
c817df185e
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: 1d279af211
am: fcea84c01a
am: 62d4693a35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I609433f0a68a61a91ddeaa3ffb7d8a8d5cf0fbe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:49:21 +00:00
Taran Singh
79e93643e5
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 4a5e1a4d3f
am: 7e1d083e05
am: 27d2496143
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I89463761e9fa2bf9a03bd4a31c3ca810e066c4e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:49:18 +00:00
Treehugger Robot
3fa27c1b83
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: c823f0aa45
am: ec895b0869
am: 9799773023
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I95a1b4d979185a68d2fbc018841ecc4ac01eda16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:46:15 +00:00
Taran Singh
2507c1bf9f
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 6f6747910d
am: 9a3cabaa42
am: 22fd06cac9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I52b6d3de0435422a8c6a983ecf8edd1d0b01aaa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:46:13 +00:00
Treehugger Robot
f13901b9c3
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: 1d279af211
am: dd37c26472
am: 2cc6bd304c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I27b45018eb9f4ca0095f8e42983040f1a67277cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:45:05 +00:00
Taran Singh
efa54fce9c
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 4a5e1a4d3f
am: 6484a7f640
am: 5552c412c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Ia0da2f8e129d942ef638929f650d18cc610c95cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:44:59 +00:00
Treehugger Robot
62d4693a35
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: 1d279af211
am: fcea84c01a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Ia3b3f1ffeeaa6fd955098f15f1115bfb723e8b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:03:59 +00:00
Taran Singh
27d2496143
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 4a5e1a4d3f
am: 7e1d083e05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I3425e53e13281e35d148be5395042bd57d4ec4e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:03:57 +00:00
Treehugger Robot
9799773023
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: c823f0aa45
am: ec895b0869
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I6374a07f77b537042132b1b6bbd9c8e482efacea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:01:47 +00:00
Taran Singh
22fd06cac9
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 6f6747910d
am: 9a3cabaa42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I314e70b2fec41d0326da7ab246eccd501e2a14ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:01:46 +00:00
Treehugger Robot
2cc6bd304c
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: 1d279af211
am: dd37c26472
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Id670ea5a88fb1231e6fa167f7f4c5b2b0f69d532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:01:03 +00:00
Taran Singh
5552c412c8
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 4a5e1a4d3f
am: 6484a7f640
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I8d65342899d69e875b725a638317162f5f38c9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 22:01:00 +00:00
Treehugger Robot
3aeda419f6
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: a0c080fd28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Ie8b456f578c6ef5e752eb9284ecdec53cdd472f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 21:15:35 +00:00
Taran Singh
d717dd1d52
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: c4e19d2afe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Ibcbd144a3814b20517030c3f54392fa6d1073573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 21:15:34 +00:00
Treehugger Robot
ec895b0869
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: c823f0aa45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I4dd2f85d5280eccf328b596ed1a80234a9912d11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 21:15:06 +00:00
Taran Singh
9a3cabaa42
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 6f6747910d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I190fe14ca9e2ee8fefbf9cc5c204236f04a2a0a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 21:15:04 +00:00
Treehugger Robot
fcea84c01a
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: 1d279af211
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I5c7817afeac87f5f4854e5f4433121ba7ddfae92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 21:14:59 +00:00
Taran Singh
7e1d083e05
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 4a5e1a4d3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I6c689260a1ce82baee992262c0ea32512d758c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 21:14:57 +00:00
Treehugger Robot
dd37c26472
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: 1d279af211
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Ic8ed9463f2e97a5376e407c53cc553d6ef85b1ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 21:12:58 +00:00
Taran Singh
6484a7f640
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 4a5e1a4d3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I444194ab1c57d376de954f3cbed4ba3d3b0cb3d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 21:12:56 +00:00
Treehugger Robot
a2fffae315
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
am: 48b541abfb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I3c887402cf34c8965127e481b321118fc8546e0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 21:12:56 +00:00
Taran Singh
481776a78e
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: feea08e693
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I11f4e10382ae4ab1872d2ee986df791f3ffd9e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 21:12:53 +00:00
Treehugger Robot
c823f0aa45
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Icba0b458b25bdef0dc25a4882c9c8799d0a46885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:38 +00:00
Taran Singh
6f6747910d
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I44012b898eec57e26fdc4d6d4a38c54578b8a0e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:37 +00:00
Treehugger Robot
1d279af211
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Ie301b476186f5861c01ca69cfedef5e6e9455a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:18 +00:00
Treehugger Robot
48b541abfb
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I572e58d1ce3150a8d5a9e489fe5b55f00177e57a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:18 +00:00
Taran Singh
feea08e693
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I533b1a673de2d3660a75452f5f7c58fe33ab55a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:17 +00:00
Taran Singh
4a5e1a4d3f
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Idaf9439f1efd96653858177bdea474ad4b85190f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:16 +00:00
Treehugger Robot
a0c080fd28
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Iaaa5b9fbdc625d749aa87e2dee865e68bc16b88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:13 +00:00
Taran Singh
c4e19d2afe
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Ib9a8ac9c10c27d50b99b1501e28a6766ff3ce70c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:11 +00:00
Han Xu
be311b88c9
Add manufactured year into hardware info page am: b452bc9f9d
am: 15da26329f
am: e319c686e7
am: 11b3eefc33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: I0cae44c45c55c7a845d6bb6370fa675551861f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:09:33 +00:00
Han Xu
9cba14f0a5
Add manufactured year into hardware info page am: b452bc9f9d
am: 2fb6c5887d
am: 13b6d23ef2
am: 9f52cc6270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: I524780e02c86132af54527f9c595ef46015ed299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:06:59 +00:00
Han Xu
9e36ae77ba
Add manufactured year into hardware info page am: b452bc9f9d
am: 15da26329f
am: 24fc0d6744
am: fc05f6766e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: Ie23e42c553e8016f866b00bd08d97555fae02188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:06:36 +00:00
Wenhui Yang
7e6443e025
Fix face re-enroll stuck for work profile
...
Call super.onCreate(savedInstanceState) first to pass the correct userId
in maxFacesEnrolled.
Test: Manual - delete face unlock for work and re-enroll and observe
face unlock can be enrolled successfully
Test: atest FaceEnrollIntroductionTest
Fixes: 284819031
Change-Id: Ic1620c0ca3ca9adc61f5281abd34471f0c1b3f97
2023-06-12 20:06:01 +00:00
Treehugger Robot
decc428857
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev
2023-06-12 19:57:26 +00:00
Han Xu
11b3eefc33
Add manufactured year into hardware info page am: b452bc9f9d
am: 15da26329f
am: e319c686e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: I86b4bc61572462e94e51762ca89722b55c44658f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 18:56:32 +00:00
Han Xu
9f52cc6270
Add manufactured year into hardware info page am: b452bc9f9d
am: 2fb6c5887d
am: 13b6d23ef2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: I8f6c848180d7e386f80e4326bc46642474490d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 18:53:51 +00:00