Bill Yi
|
f0890308c5
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b31a221ace -s ours am: da6144dcbd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745995
Change-Id: Iccf6e7b6d9995f5514c0c82db7d67b31052ca709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 18:13:43 +00:00 |
|
TreeHugger Robot
|
69929e2dcd
|
Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e am: fe3d04de86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: I2e24d1cbce2ac8bea5045f41156a534df5fd0c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 18:13:04 +00:00 |
|
Bill Yi
|
204786c737
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0 am: 5a7f4fcb00 -s ours am: 7044a2ee63 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: I2dd09d9c797d630bf7953ef9eb89557012b9f4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 18:13:03 +00:00 |
|
Bill Yi
|
4801f9a9aa
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 89a0c5fb00 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746001
Change-Id: I55225551206e9b9b72a15fd08fd09de6bfb4c06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 18:12:20 +00:00 |
|
Bill Yi
|
98baf75c26
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8fac9ad72b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746001
Change-Id: I110823dbe4bfacea28daa5efef2674095146af55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 18:12:19 +00:00 |
|
Bill Yi
|
ee6033af75
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 08549ed959 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746569
Change-Id: I88b70dc5e038e9b9c95bef55acf3653a93483156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 18:06:12 +00:00 |
|
Bill Yi
|
01ef39c8b1
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5491463fe6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746569
Change-Id: I7df2ca00922b5dbbd4cdddc4913215669053c457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 18:06:09 +00:00 |
|
Bill Yi
|
da6144dcbd
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b31a221ace -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745995
Change-Id: Iff358f9dff5601de01a21e17ccc59d050183d9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 17:44:07 +00:00 |
|
TreeHugger Robot
|
fe3d04de86
|
Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: I9cecbd87511cb97a05fff121fac736e26f140ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 17:39:59 +00:00 |
|
Bill Yi
|
7044a2ee63
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0 am: 5a7f4fcb00 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: Ib0ae216d77188d560933313a35a1b02196a22737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 17:39:58 +00:00 |
|
Bill Yi
|
89a0c5fb00
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
|
2022-04-14 17:16:07 +00:00 |
|
Bill Yi
|
08549ed959
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
|
2022-04-14 17:14:41 +00:00 |
|
TreeHugger Robot
|
55e91da24e
|
Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0
Import translations. DO NOT MERGE ANYWHERE
|
2022-04-14 17:08:18 +00:00 |
|
TreeHugger Robot
|
2dd28aa043
|
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a am: de1481d68a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745804
Change-Id: I5f6e6b48b9fd8c7ae26a0d43e49b6931c78633a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:55:52 +00:00 |
|
Quang Luong
|
0f1e422f99
|
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4 am: 0bbdf3a983
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256
Change-Id: Ie30e4eccddb2ccd0c1cb22f4c235c83aa894980b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:53:45 +00:00 |
|
TreeHugger Robot
|
de1481d68a
|
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745804
Change-Id: I675e9e5e1100c91eb01639a020be65f0bdd47e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:34:59 +00:00 |
|
Quang Luong
|
0bbdf3a983
|
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256
Change-Id: I6839b69c92f10905e1386c0a4555a4c980eccebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 16:34:52 +00:00 |
|
TreeHugger Robot
|
37c2ac2c6a
|
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev
|
2022-04-14 16:28:11 +00:00 |
|
Quang Luong
|
93ae7acbf4
|
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev
|
2022-04-14 16:14:21 +00:00 |
|
Tsung-Mao Fang
|
cf162bc514
|
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5 am: de992a99f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388
Change-Id: I5bb37aab6ba314bca3db22a574dbe38d671e4d3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:26:00 +00:00 |
|
Bill Yi
|
6883e565c5
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
|
2022-04-14 15:13:58 +00:00 |
|
Bill Yi
|
5f31fac340
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
|
2022-04-14 15:08:42 +00:00 |
|
Tsung-Mao Fang
|
de992a99f8
|
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388
Change-Id: I89af98755aef258bfa9234bcdd490ca9a43c9e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 15:05:45 +00:00 |
|
YK Hung
|
b4dc55d47b
|
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9 am: fe2e6b19d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17751849
Change-Id: Ic537bb4a1e610e2d8fa02b303f9f8056e013627b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 14:55:05 +00:00 |
|
Tsung-Mao Fang
|
7877c073e5
|
Merge "Use androidx.window from prebuilt." into tm-dev
|
2022-04-14 14:40:21 +00:00 |
|
YK Hung
|
fe2e6b19d8
|
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17751849
Change-Id: If8eba2fe329e9b4d078d2b9d25bc345480d9a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-14 14:33:31 +00:00 |
|
YK Hung
|
3a08246bd9
|
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev
|
2022-04-14 14:12:33 +00:00 |
|
ykhung
|
39972db17d
|
Pass the activtiy launch flags into the AdvancedPowerUsageDetail
Bug: 227978302
Test: manual
Change-Id: I036bc90eb91fd59137b51817665378f218bbad1a
|
2022-04-14 19:57:14 +08:00 |
|
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
|
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
|
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 |
|