SongFerngWang
|
bd457c3c5c
|
[automerger skipped] [MEP] The condition of "null point check" is wrong am: 5c0df6913b am: 6a0742b2fb am: ffdf3513ec -s ours am: d625370f83 -s ours
am skip reason: Merged-In I1b81faf082163643c1d17eae2f66d75b450288fe with SHA-1 ce8232d0a4 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063566
Change-Id: I0e42a5db8d4449133810982658b8da7c242d82c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:19 +00:00 |
|
SongFerngWang
|
8c636211e4
|
[automerger skipped] Fix the settings crash when SimDialogActivity is null am: d786b64ff6 am: a800c05ac7 am: d65110a8ff -s ours am: 444690e5ec -s ours
am skip reason: Merged-In I9a5964400a63053e362632944b9e7aa8ec1bbea8 with SHA-1 a3b98f5d04 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063565
Change-Id: Ice4340331914db9b888587944a2bb6d9fbc9797d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:18 +00:00 |
|
SongFerngWang
|
044697cd7d
|
[automerger skipped] [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8 am: bfe417ee13 am: 56f8390f6e -s ours am: 3b41ab2116 -s ours
am skip reason: Merged-In I7fef78547f4e6283791cd15a03275eaefeb50e3c with SHA-1 e90d80cc52 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063564
Change-Id: Ibb0124dc309fc5c78add6f9fd3fca30f49461ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:17 +00:00 |
|
SongFerngWang
|
30af06f976
|
[automerger skipped] [MEP] the port id is wrong am: 9ee91da8e1 am: f80bc78252 am: b8a9355134 -s ours am: 9d3385835f -s ours
am skip reason: Merged-In I70a02299c40ada4c2a700fc035034e8db24b6f03 with SHA-1 28e8f4d65a is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063563
Change-Id: Ide340d06ddf0847eaa4e9b0b1355c12446007036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:16 +00:00 |
|
SongFerngWang
|
55e7c1c807
|
[automerger skipped] [MEP] Inserting a pSIM while user has 2 esims, showing the MEP dialog am: 650b048749 am: e0e40b1e88 am: f74ef50676 -s ours am: aa0b021163 -s ours
am skip reason: Merged-In I48fa3d483873315d7e05b39369085c48af779522 with SHA-1 c747455196 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063562
Change-Id: Ib5d47229c5b6baf3c0de8ca19d57158421d9e6c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:15 +00:00 |
|
SongFerngWang
|
1f91638bfc
|
[automerger skipped] [MEP] Refactor SlotSidecar API for all of sim page. am: 3597302ae1 am: f54b0ca79f am: bb912216d7 -s ours am: c4c07f8b8b -s ours
am skip reason: Merged-In I81479a0c514f2b8f58b9167b31d357f017732482 with SHA-1 4d0749febd is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063561
Change-Id: I988a5cb4cdd7a7ecaf3097cb77c52bacbf475c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:13 +00:00 |
|
SongFerngWang
|
e4eb489087
|
[automerger skipped] [MEP]The Esim's PhysicalSlotIndex is wrong am: d3f3730721 am: f795e9b6d0 am: 4d039eaefc -s ours am: 06090f9837 -s ours
am skip reason: Merged-In Ic43d6c4a3209d24673769b71b9a148e780ee81ab with SHA-1 28bed8ec9f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063560
Change-Id: I8d7316751687c3272cba45b00ea0fc318ff9b5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:12 +00:00 |
|
SongFerngWang
|
0b4df9c03f
|
[automerger skipped] Lost code for setting the list as visible am: 130b739ed1 am: 2b02a6f3d2 am: 094ba6c077 -s ours am: c72a358a86 -s ours
am skip reason: Merged-In If6ad5422a820627873e58b144e7b65a8b0130def with SHA-1 04eec0382c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063559
Change-Id: I88fa58bb2b18667b7f5eb91c393627c154eca8cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:11 +00:00 |
|
SongFerngWang
|
e70a226a70
|
[automerger skipped] The list does not follow the UX dialog design doc in alert dialog. am: f88ffb09fd am: a6794dcc8a am: 22f38eeacd -s ours am: 334a700309 -s ours
am skip reason: Merged-In I758d60202fcf477aeb49014e60b949e7ad08c082 with SHA-1 f2a8008ae3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063558
Change-Id: I98c8ba20ab9f56550601591fa55a607ef35e7874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:10 +00:00 |
|
SongFerngWang
|
5b8ece05f8
|
[automerger skipped] The carrier name is wrong in the dialog am: f513452d4b am: c70bde0995 am: d4ca5a289f -s ours am: e194be8946 -s ours
am skip reason: Merged-In I894c78fccab511f26bf779638cac1f18a07a86c4 with SHA-1 b5766e4422 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063557
Change-Id: Ifabd9b315f9f0e32aea24c64e084e6222c43e3bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:09 +00:00 |
|
SongFerngWang
|
3983b43715
|
[automerger skipped] Refine the mobile data selection UI am: 964c7d5eaf am: d4b95990e9 am: de8a16419e -s ours am: e630379229 -s ours
am skip reason: Merged-In I1ec587fd9d64ad67bbf3479c7931c0a901f572cf with SHA-1 43ebe68063 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063556
Change-Id: I3b90c19b5756a6dc7b98c1fa81229704a46f5d26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:07 +00:00 |
|
SongFerng Wang
|
8cde4c0745
|
Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d am: b1166a441c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555
Change-Id: Ifafae2079cf881aa64285e40759f8a2946034385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:43 +00:00 |
|
Tom Hsu
|
f5be6b7a9c
|
Merge "[Panlingual] Add a description for per app language." into tm-dev am: b18b106300 am: 727e101ee5 am: 6f7ea55682
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17742047
Change-Id: I952324a4d4d9b32ba02114e209211533ed2f5351
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:43 +00:00 |
|
SongFerng Wang
|
9b8939238a
|
[automerger skipped] Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182 am: 9d10f0a9fb -s ours am: 68defd99f1 -s ours
am skip reason: Merged-In I6871db6c2d8d7b9f3cb334bb5cd2c7978b5b3b85 with SHA-1 506c3df5b9 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064409
Change-Id: Ib527629497de7581d7bfa99da2d40b5c1ae5790c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:33 +00:00 |
|
SongFerngWang
|
8c63cd8943
|
[automerger skipped] In E+E, the user can't enable the PSIM am: ccd55cc5c9 am: 6282d8a5de am: 10d36c9800 -s ours am: d1ae5c3d08 -s ours
am skip reason: Merged-In Ia261e3b41c6c4a43a5429815d93ae9f6ff16f0ec with SHA-1 68cfaafe73 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064408
Change-Id: I9d60ef1d005f6c4ba004813ab5d0880c10aa6eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:31 +00:00 |
|
SongFerngWang
|
8061bfab60
|
[automerger skipped] [MEP] psim's logical slot index is 0 am: 2479c9f7bd am: 83311b6208 am: bca382eefb -s ours am: f137d36ea7 -s ours
am skip reason: Merged-In I1588bd4a2f552a6b41844883b6ad50f1bfec95de with SHA-1 0b948c827b is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064407
Change-Id: Ic377a178c8839dbe3474a0c191447eed3e7998cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:30 +00:00 |
|
SongFerngWang
|
4be676eefb
|
[automerger skipped] [MEP] The condition of "null point check" is wrong am: 5c0df6913b am: 6a0742b2fb am: ffdf3513ec -s ours am: d625370f83 -s ours
am skip reason: Merged-In I1b81faf082163643c1d17eae2f66d75b450288fe with SHA-1 ce8232d0a4 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063566
Change-Id: I7b5e471753fba2d3982ec1e3800da9eefba2a8d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:29 +00:00 |
|
SongFerngWang
|
79fc0d9e7f
|
[automerger skipped] Fix the settings crash when SimDialogActivity is null am: d786b64ff6 am: a800c05ac7 am: d65110a8ff -s ours am: 444690e5ec -s ours
am skip reason: Merged-In I9a5964400a63053e362632944b9e7aa8ec1bbea8 with SHA-1 a3b98f5d04 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063565
Change-Id: I9b89d68c83691c7aaa78adac3f8a31dfbcd63808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:28 +00:00 |
|
SongFerngWang
|
be79c096c9
|
[automerger skipped] [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8 am: bfe417ee13 am: 56f8390f6e -s ours am: 3b41ab2116 -s ours
am skip reason: Merged-In I7fef78547f4e6283791cd15a03275eaefeb50e3c with SHA-1 e90d80cc52 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063564
Change-Id: I5d329a328cb2b58b7379f900d46394f3d8e1ac1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:26 +00:00 |
|
SongFerngWang
|
1a569af210
|
[automerger skipped] [MEP] the port id is wrong am: 9ee91da8e1 am: f80bc78252 am: b8a9355134 -s ours am: 9d3385835f -s ours
am skip reason: Merged-In I70a02299c40ada4c2a700fc035034e8db24b6f03 with SHA-1 28e8f4d65a is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063563
Change-Id: I59ba502ff0dedf8329ab4a6b49428e9ae18d8bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:25 +00:00 |
|
SongFerngWang
|
b413727634
|
[automerger skipped] [MEP] Inserting a pSIM while user has 2 esims, showing the MEP dialog am: 650b048749 am: e0e40b1e88 am: f74ef50676 -s ours am: aa0b021163 -s ours
am skip reason: Merged-In I48fa3d483873315d7e05b39369085c48af779522 with SHA-1 c747455196 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063562
Change-Id: I74a55c2c04969c8d889f68de1ea9fb78516cc2f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:24 +00:00 |
|
SongFerngWang
|
74857bf02f
|
[automerger skipped] [MEP] Refactor SlotSidecar API for all of sim page. am: 3597302ae1 am: f54b0ca79f am: bb912216d7 -s ours am: c4c07f8b8b -s ours
am skip reason: Merged-In I81479a0c514f2b8f58b9167b31d357f017732482 with SHA-1 4d0749febd is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063561
Change-Id: Icce3cb43b91aba36c3870fdd3d8581f59416df07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:23 +00:00 |
|
SongFerngWang
|
8458085eea
|
[automerger skipped] [MEP]The Esim's PhysicalSlotIndex is wrong am: d3f3730721 am: f795e9b6d0 am: 4d039eaefc -s ours am: 06090f9837 -s ours
am skip reason: Merged-In Ic43d6c4a3209d24673769b71b9a148e780ee81ab with SHA-1 28bed8ec9f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063560
Change-Id: Iecf6b8983b63002f001d658c71daf03180dc1210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:22 +00:00 |
|
SongFerngWang
|
c5804a5f65
|
[automerger skipped] Lost code for setting the list as visible am: 130b739ed1 am: 2b02a6f3d2 am: 094ba6c077 -s ours am: c72a358a86 -s ours
am skip reason: Merged-In If6ad5422a820627873e58b144e7b65a8b0130def with SHA-1 04eec0382c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063559
Change-Id: I96b1953360fbeacc902f2a7636ae22cc9157faac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:20 +00:00 |
|
SongFerngWang
|
179bd5cf0f
|
[automerger skipped] The list does not follow the UX dialog design doc in alert dialog. am: f88ffb09fd am: a6794dcc8a am: 22f38eeacd -s ours am: 334a700309 -s ours
am skip reason: Merged-In I758d60202fcf477aeb49014e60b949e7ad08c082 with SHA-1 f2a8008ae3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063558
Change-Id: I7fb45cb8656f7cb81acab763f5553ba85112010f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:19 +00:00 |
|
SongFerngWang
|
6cacb3d64e
|
[automerger skipped] The carrier name is wrong in the dialog am: f513452d4b am: c70bde0995 am: d4ca5a289f -s ours am: e194be8946 -s ours
am skip reason: Merged-In I894c78fccab511f26bf779638cac1f18a07a86c4 with SHA-1 b5766e4422 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063557
Change-Id: I900fe2d8d8547c92350d2fc2eed6d56955b233d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:18 +00:00 |
|
SongFerngWang
|
3a9d686da2
|
[automerger skipped] Refine the mobile data selection UI am: 964c7d5eaf am: d4b95990e9 am: de8a16419e -s ours am: e630379229 -s ours
am skip reason: Merged-In I1ec587fd9d64ad67bbf3479c7931c0a901f572cf with SHA-1 43ebe68063 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063556
Change-Id: I16c090e71ef5fd7574bb9f23ae93fe0646894770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:34:17 +00:00 |
|
SongFerng Wang
|
52052bd1b4
|
Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d am: b1166a441c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555
Change-Id: I3c6546281c099379e96c182a96b49f1683340963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:33:53 +00:00 |
|
SongFerng Wang
|
68defd99f1
|
[automerger skipped] Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182 am: 9d10f0a9fb -s ours
am skip reason: Merged-In I6871db6c2d8d7b9f3cb334bb5cd2c7978b5b3b85 with SHA-1 506c3df5b9 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064409
Change-Id: I89670238b2c3a2b8010be65e01935e6285685c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:13:05 +00:00 |
|
SongFerngWang
|
d1ae5c3d08
|
[automerger skipped] In E+E, the user can't enable the PSIM am: ccd55cc5c9 am: 6282d8a5de am: 10d36c9800 -s ours
am skip reason: Merged-In Ia261e3b41c6c4a43a5429815d93ae9f6ff16f0ec with SHA-1 68cfaafe73 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064408
Change-Id: I1d01c1a36348277b6d124ab24c9d55dfc6abb661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:13:04 +00:00 |
|
SongFerngWang
|
f137d36ea7
|
[automerger skipped] [MEP] psim's logical slot index is 0 am: 2479c9f7bd am: 83311b6208 am: bca382eefb -s ours
am skip reason: Merged-In I1588bd4a2f552a6b41844883b6ad50f1bfec95de with SHA-1 0b948c827b is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064407
Change-Id: I8c09155fff1c19fbd7b364dfb6ecce726136e8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:13:02 +00:00 |
|
SongFerngWang
|
d625370f83
|
[automerger skipped] [MEP] The condition of "null point check" is wrong am: 5c0df6913b am: 6a0742b2fb am: ffdf3513ec -s ours
am skip reason: Merged-In I1b81faf082163643c1d17eae2f66d75b450288fe with SHA-1 ce8232d0a4 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063566
Change-Id: I7c17b66a62c4e72ec144fcad8bde4ced635d6944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:13:00 +00:00 |
|
SongFerngWang
|
444690e5ec
|
[automerger skipped] Fix the settings crash when SimDialogActivity is null am: d786b64ff6 am: a800c05ac7 am: d65110a8ff -s ours
am skip reason: Merged-In I9a5964400a63053e362632944b9e7aa8ec1bbea8 with SHA-1 a3b98f5d04 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063565
Change-Id: I9ae74a72fbc0c9db915efdb50bf815a7714f39b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:12:59 +00:00 |
|
SongFerngWang
|
3b41ab2116
|
[automerger skipped] [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8 am: bfe417ee13 am: 56f8390f6e -s ours
am skip reason: Merged-In I7fef78547f4e6283791cd15a03275eaefeb50e3c with SHA-1 e90d80cc52 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063564
Change-Id: I47066cf1aff7fb24c554eb386718a2fb4d565efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:12:57 +00:00 |
|
SongFerngWang
|
9d3385835f
|
[automerger skipped] [MEP] the port id is wrong am: 9ee91da8e1 am: f80bc78252 am: b8a9355134 -s ours
am skip reason: Merged-In I70a02299c40ada4c2a700fc035034e8db24b6f03 with SHA-1 28e8f4d65a is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063563
Change-Id: Icfb8f9dc004bcbac53bc39b78092c3bc7abd0b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:12:55 +00:00 |
|
SongFerngWang
|
aa0b021163
|
[automerger skipped] [MEP] Inserting a pSIM while user has 2 esims, showing the MEP dialog am: 650b048749 am: e0e40b1e88 am: f74ef50676 -s ours
am skip reason: Merged-In I48fa3d483873315d7e05b39369085c48af779522 with SHA-1 c747455196 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063562
Change-Id: I00556eb13b1b2bd14f7b098a3565724739af050b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:12:53 +00:00 |
|
SongFerngWang
|
c4c07f8b8b
|
[automerger skipped] [MEP] Refactor SlotSidecar API for all of sim page. am: 3597302ae1 am: f54b0ca79f am: bb912216d7 -s ours
am skip reason: Merged-In I81479a0c514f2b8f58b9167b31d357f017732482 with SHA-1 4d0749febd is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063561
Change-Id: I59e8f3f102530f7ba3306ca8ba4afbc575f980a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:12:52 +00:00 |
|
Tom Hsu
|
6f7ea55682
|
Merge "[Panlingual] Add a description for per app language." into tm-dev am: b18b106300 am: 727e101ee5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17742047
Change-Id: I5328dbbf734d054231b5fc21e7312cdd5ab15542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:12:49 +00:00 |
|
SongFerngWang
|
06090f9837
|
[automerger skipped] [MEP]The Esim's PhysicalSlotIndex is wrong am: d3f3730721 am: f795e9b6d0 am: 4d039eaefc -s ours
am skip reason: Merged-In Ic43d6c4a3209d24673769b71b9a148e780ee81ab with SHA-1 28bed8ec9f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063560
Change-Id: I9ea7a2cd19570d60773de57ad39c013177ee6371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:12:49 +00:00 |
|
SongFerngWang
|
c72a358a86
|
[automerger skipped] Lost code for setting the list as visible am: 130b739ed1 am: 2b02a6f3d2 am: 094ba6c077 -s ours
am skip reason: Merged-In If6ad5422a820627873e58b144e7b65a8b0130def with SHA-1 04eec0382c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063559
Change-Id: I59f61990534fb7ebcf6076c4d3095eeecae04981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:12:48 +00:00 |
|
SongFerngWang
|
334a700309
|
[automerger skipped] The list does not follow the UX dialog design doc in alert dialog. am: f88ffb09fd am: a6794dcc8a am: 22f38eeacd -s ours
am skip reason: Merged-In I758d60202fcf477aeb49014e60b949e7ad08c082 with SHA-1 f2a8008ae3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063558
Change-Id: Ia2c3a0b1c7b413bb8945835e7d853fe83dc10c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:12:46 +00:00 |
|
SongFerngWang
|
e194be8946
|
[automerger skipped] The carrier name is wrong in the dialog am: f513452d4b am: c70bde0995 am: d4ca5a289f -s ours
am skip reason: Merged-In I894c78fccab511f26bf779638cac1f18a07a86c4 with SHA-1 b5766e4422 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063557
Change-Id: I75eab4aca18db3d71787e9f207ab51a064670e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:12:45 +00:00 |
|
SongFerngWang
|
e630379229
|
[automerger skipped] Refine the mobile data selection UI am: 964c7d5eaf am: d4b95990e9 am: de8a16419e -s ours
am skip reason: Merged-In I1ec587fd9d64ad67bbf3479c7931c0a901f572cf with SHA-1 43ebe68063 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063556
Change-Id: Ib1cc30a7746ff931ae778fdccae6a7bf22bd85fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:12:43 +00:00 |
|
Tom Hsu
|
20c1f7b6d4
|
Merge "[Panlingual] Add a description for per app language." into tm-dev am: b18b106300 am: 0d204eadef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17742047
Change-Id: Ic2c84b0da4a6546e96ab4bcac760d7dce9c4534c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:12:29 +00:00 |
|
SongFerng Wang
|
b1166a441c
|
Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555
Change-Id: Ibcd93e3f6610c1f1dfbfa687ba8bec390b8456b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:11:52 +00:00 |
|
SongFerng Wang
|
9d10f0a9fb
|
Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064409
Change-Id: If1486cddb0887de41eef67dcdb04fe385261cbb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 09:59:37 +00:00 |
|
SongFerngWang
|
10d36c9800
|
In E+E, the user can't enable the PSIM am: ccd55cc5c9 am: 6282d8a5de
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064408
Change-Id: I754af5b8ba51d3cfb73fc894796163209cf8d723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 09:59:36 +00:00 |
|
SongFerngWang
|
bca382eefb
|
[MEP] psim's logical slot index is 0 am: 2479c9f7bd am: 83311b6208
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064407
Change-Id: I88fe8f02e2cfc1d65a2626290b747cc454958819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 09:59:35 +00:00 |
|
SongFerngWang
|
ffdf3513ec
|
[MEP] The condition of "null point check" is wrong am: 5c0df6913b am: 6a0742b2fb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063566
Change-Id: I0f664206c950dae9204f36f1a28f1c63112b9bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 09:59:34 +00:00 |
|
SongFerngWang
|
d65110a8ff
|
Fix the settings crash when SimDialogActivity is null am: d786b64ff6 am: a800c05ac7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063565
Change-Id: Id6de8ec6e269fc6720c57ee04bd2e26d90293ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 09:59:32 +00:00 |
|