SongFerng Wang
|
1612f73d2d
|
[automerger skipped] Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182 am: 9d10f0a9fb -s ours am: 68defd99f1 -s ours am: 97b86392fb -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: I5f2279cf7b568fe832fa864b04df10853334fa8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:16 +00:00 |
|
SongFerngWang
|
d6b4e5277f
|
[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: 11213d623e -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: I0116edde251547b63666f1443c4f5b097736e9b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:15 +00:00 |
|
SongFerngWang
|
f77becc321
|
[automerger skipped] [MEP] psim's logical slot index is 0 am: 2479c9f7bd am: 83311b6208 am: bca382eefb -s ours am: f137d36ea7 -s ours am: cc06f67db0 -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: I4cb004824739e27307153e1007091c141057bea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:14 +00:00 |
|
SongFerngWang
|
00b8ee8f12
|
[automerger skipped] [MEP] The condition of "null point check" is wrong am: 5c0df6913b am: 6a0742b2fb am: ffdf3513ec -s ours am: d625370f83 -s ours am: bd457c3c5c -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: If4af911bb091ed41c7605f1a3530de9a046a9d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:13 +00:00 |
|
SongFerngWang
|
ff051a1de9
|
[automerger skipped] Fix the settings crash when SimDialogActivity is null am: d786b64ff6 am: a800c05ac7 am: d65110a8ff -s ours am: 444690e5ec -s ours am: 8c636211e4 -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: I130c02259002697830a03263d4ef13b30a3af334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:12 +00:00 |
|
SongFerngWang
|
6933e9844d
|
[automerger skipped] [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8 am: bfe417ee13 am: 56f8390f6e -s ours am: 3b41ab2116 -s ours am: 044697cd7d -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: I1d105fe62e3e064347cfa14170c624f9fbb73a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:11 +00:00 |
|
SongFerngWang
|
3da19ba9f5
|
[automerger skipped] [MEP] the port id is wrong am: 9ee91da8e1 am: f80bc78252 am: b8a9355134 -s ours am: 9d3385835f -s ours am: 30af06f976 -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: I5763388c4be0da61f59493c77ac05d6625e25b96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:09 +00:00 |
|
SongFerngWang
|
0e702ee172
|
[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: 55e7c1c807 -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: I4a6ca7dbb51d20544eea91e6b9b495e61a49c523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:08 +00:00 |
|
SongFerngWang
|
bf6f75d976
|
[automerger skipped] [MEP] Refactor SlotSidecar API for all of sim page. am: 3597302ae1 am: f54b0ca79f am: bb912216d7 -s ours am: c4c07f8b8b -s ours am: 1f91638bfc -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: I6220cfa280366252e7b17ac308e8c13529a9387c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:07 +00:00 |
|
SongFerngWang
|
bbdb6330ba
|
[automerger skipped] [MEP]The Esim's PhysicalSlotIndex is wrong am: d3f3730721 am: f795e9b6d0 am: 4d039eaefc -s ours am: 06090f9837 -s ours am: e4eb489087 -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: I346f41f65f17a369c19a1141439bb21da304fb96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:06 +00:00 |
|
SongFerngWang
|
9d394ff979
|
[automerger skipped] Lost code for setting the list as visible am: 130b739ed1 am: 2b02a6f3d2 am: 094ba6c077 -s ours am: c72a358a86 -s ours am: 0b4df9c03f -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: Ifbda8701219c4d83ad199a53f392c51455ea1167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:04 +00:00 |
|
SongFerngWang
|
5dd5f5c555
|
[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: e70a226a70 -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: I98680f77c8a6bab2ca75a3c5e53c1f84a0694b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:03 +00:00 |
|
SongFerngWang
|
29f5a6faa9
|
[automerger skipped] The carrier name is wrong in the dialog am: f513452d4b am: c70bde0995 am: d4ca5a289f -s ours am: e194be8946 -s ours am: 5b8ece05f8 -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: I0e4909ccc4b690896461d3ff0bfa9d1de33877ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:02 +00:00 |
|
SongFerngWang
|
bed126e923
|
[automerger skipped] Refine the mobile data selection UI am: 964c7d5eaf am: d4b95990e9 am: de8a16419e -s ours am: e630379229 -s ours am: 3983b43715 -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: Ib1b0d014c3ec9438677f5cb965efa5e983e40dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:01 +00:00 |
|
SongFerng Wang
|
35cf9a7649
|
[automerger skipped] Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182 am: 9d10f0a9fb -s ours am: 68defd99f1 -s ours am: 9b8939238a -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: Iab6a296af89962df2319b099ca62551e75acac89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:01 +00:00 |
|
SongFerngWang
|
dc788c0996
|
[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: 8c63cd8943 -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: I42be0fd721acd51edc40772a068e92bb6ead49a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:31:00 +00:00 |
|
SongFerngWang
|
21905aaecf
|
[automerger skipped] [MEP] psim's logical slot index is 0 am: 2479c9f7bd am: 83311b6208 am: bca382eefb -s ours am: f137d36ea7 -s ours am: 8061bfab60 -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: I9c9d9cfeda8897843a36341c6bd334b893fb374f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:30:58 +00:00 |
|
SongFerngWang
|
9541567f47
|
[automerger skipped] [MEP] The condition of "null point check" is wrong am: 5c0df6913b am: 6a0742b2fb am: ffdf3513ec -s ours am: d625370f83 -s ours am: 4be676eefb -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: Ic11a79886b22dc210c0476c9d28cfeda3eb18e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:30:57 +00:00 |
|
SongFerngWang
|
100c986083
|
[automerger skipped] Fix the settings crash when SimDialogActivity is null am: d786b64ff6 am: a800c05ac7 am: d65110a8ff -s ours am: 444690e5ec -s ours am: 79fc0d9e7f -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: Ib5dc6b867ccf78a5f0a639eeb359c1efa186a5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:30:56 +00:00 |
|
SongFerngWang
|
ffd8d09919
|
[automerger skipped] [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8 am: bfe417ee13 am: 56f8390f6e -s ours am: 3b41ab2116 -s ours am: be79c096c9 -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: I3b4fb1e6447d4c20a6a5c8cba493fbcdd3a238b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:30:55 +00:00 |
|
SongFerngWang
|
5ebd9cacf4
|
[automerger skipped] [MEP] the port id is wrong am: 9ee91da8e1 am: f80bc78252 am: b8a9355134 -s ours am: 9d3385835f -s ours am: 1a569af210 -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: Iaa13b15ebaf5278f8eef5d7302acf6b306d0b12c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:30:54 +00:00 |
|
SongFerngWang
|
54eabb85ed
|
[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: b413727634 -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: I47f8c82b71a687dd3d8228f820ca01532c87f1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:30:52 +00:00 |
|
SongFerngWang
|
36ff2abc30
|
[automerger skipped] [MEP] Refactor SlotSidecar API for all of sim page. am: 3597302ae1 am: f54b0ca79f am: bb912216d7 -s ours am: c4c07f8b8b -s ours am: 74857bf02f -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: I6a6dcf837b6c0f87ee01ba0ccf4ca06983e4d1a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:30:51 +00:00 |
|
SongFerngWang
|
e85b3b5613
|
[automerger skipped] [MEP]The Esim's PhysicalSlotIndex is wrong am: d3f3730721 am: f795e9b6d0 am: 4d039eaefc -s ours am: 06090f9837 -s ours am: 8458085eea -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: I1b970b4bdbca309e00687702cf7ee18ecc368fb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:30:50 +00:00 |
|
SongFerngWang
|
c380edd28d
|
[automerger skipped] Lost code for setting the list as visible am: 130b739ed1 am: 2b02a6f3d2 am: 094ba6c077 -s ours am: c72a358a86 -s ours am: c5804a5f65 -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: If95340072083933e2443ae98c7fe2382db6d074b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:30:49 +00:00 |
|
SongFerngWang
|
9fb800cd2d
|
[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: 179bd5cf0f -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: Ic55fb544fa1d7eb35d7bd59e4b5bcede88446fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:30:48 +00:00 |
|
SongFerngWang
|
815b57fbf0
|
[automerger skipped] The carrier name is wrong in the dialog am: f513452d4b am: c70bde0995 am: d4ca5a289f -s ours am: e194be8946 -s ours am: 6cacb3d64e -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: Icb36a6e09c47fc8986d4791ed51c0aa64f82ce2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:30:46 +00:00 |
|
SongFerngWang
|
0859526931
|
[automerger skipped] Refine the mobile data selection UI am: 964c7d5eaf am: d4b95990e9 am: de8a16419e -s ours am: e630379229 -s ours am: 3a9d686da2 -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: Ia3258d4541a98cd901bf1c0536139b4efdfe7178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:30:45 +00:00 |
|
SongFerng Wang
|
a10d61b60f
|
Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d am: b1166a441c am: 8cde4c0745
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555
Change-Id: Id976aecef2fbbe3a1be1abeecd26ed7adc6eac44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:30:03 +00:00 |
|
SongFerng Wang
|
89ea026791
|
Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d am: b1166a441c am: 52052bd1b4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555
Change-Id: I90bfc429b4a7ebdec3213ab111d433dc372f1682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 11:29:01 +00:00 |
|
Hugh Chen
|
bf81ecd75f
|
When in guest mode hide the rename button
Bug: 198173108
Test: local test
Change-Id: I29eb227104baa43ab8223f86a6a5d9cecd612bde
|
2022-04-14 11:21:07 +00:00 |
|
SongFerng Wang
|
97b86392fb
|
[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: Ida9b92e9fabcbdef72e5b011829c658796f7ba7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:23 +00:00 |
|
SongFerngWang
|
11213d623e
|
[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: I08f71204bde6bc3ac730cf9b118de9b3af66caf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:22 +00:00 |
|
SongFerngWang
|
cc06f67db0
|
[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: I26e1533faafa71b8bb4a068c0dee15ba62ff0cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 10:35:21 +00:00 |
|
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 |
|