PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,112 Commits 1 Branch 0 Tags
ae26f380b2fba076c7ce0faf2cedaa9ab84daffb
Commit Graph

103112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
e3b581c350 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-14 17:08:18 +00:00
Yuri Lin
554ab1fe3e Special handling for intent coming from "welcome" notification. 
This notification is an introduction to new notification permission changes in T and is shown to the user upon upgrade; this change records that the user has seen/interacted with the notification already so we don't have to keep showing it.

This change essentially makes a copy of the existing functionality of NotificationAppListActivity, but meant only for access internally (so that neither the activity nor the associated action is exported/publicly accessible).

Bug: 225373531
Test: manual with the change that sends the notification
Change-Id: I20c6084652ea11a8d0a002a21561fe50b9cf5de3
 2022-04-14 12:54:56 -04:00
TreeHugger Robot
d23bd16dd7 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: I1ff64d526b48eb492a3a5a2a8a5a700f8b32192f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 16:33:58 +00:00
Quang Luong
6f7a9b88ba 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: I1193e74c90338de9a110f73dae40aaf07df556c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 16:33:51 +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
6c02827b8b 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: I364f2fe39496649d00752c01e7e88f8754c0e4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:04:40 +00:00
Lucas Silva
1ccbf8b7d5 Add hyphenation to customize button text. 
In some languages, customize may be a long word which doesn't fit in a
single line and should be hyphenated.

Bug: 228329886
Test: locally on device
Change-Id: Ibf647fc4c18b3eb927f2b6f6ca018f2b38e6f7b1
 2022-04-14 14:48:14 +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
2fbedfdb5d 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: I77a0e7e80ddd64f6cf3ece887585daf279eb396c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 14:32:22 +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
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
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
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
SongFerngWang
56f8390f6e [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8 am: bfe417ee13 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063564

Change-Id: I5ec77b0842dd250095adbb1cc063ec9d9e656a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:31 +00:00
SongFerngWang
b8a9355134 [MEP] the port id is wrong am: 9ee91da8e1 am: f80bc78252 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063563

Change-Id: I64b9af4dca993a57954ef9163f5fa1dd5bd6da89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 09:59:30 +00:00