This website requires JavaScript.
e3b581c350
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
TreeHugger Robot
2022-04-14 17:08:18 +00:00
55e91da24e
Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev
TreeHugger Robot
2022-04-14 17:08:18 +00:00
2dd28aa043
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a am: de1481d68a
TreeHugger Robot
2022-04-14 16:55:52 +00:00
554ab1fe3e
Special handling for intent coming from "welcome" notification.
Yuri Lin
2022-04-12 17:05:49 -04:00
0f1e422f99
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4 am: 0bbdf3a983
Quang Luong
2022-04-14 16:53:45 +00:00
26587e0f89
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a am: d23bd16dd7
TreeHugger Robot
2022-04-14 16:52:33 +00:00
132e8286cb
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4 am: 6f7a9b88ba
Quang Luong
2022-04-14 16:51:21 +00:00
de1481d68a
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a
TreeHugger Robot
2022-04-14 16:34:59 +00:00
0bbdf3a983
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4
Quang Luong
2022-04-14 16:34:52 +00:00
d23bd16dd7
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a
TreeHugger Robot
2022-04-14 16:33:58 +00:00
6f7a9b88ba
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4
Quang Luong
2022-04-14 16:33:51 +00:00
37c2ac2c6a
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev
TreeHugger Robot
2022-04-14 16:28:11 +00:00
93ae7acbf4
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev
Quang Luong
2022-04-14 16:14:21 +00:00
b36c654c2f
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5 am: de992a99f8 am: cf162bc514
Tsung-Mao Fang
2022-04-14 15:27:07 +00:00
cf162bc514
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5 am: de992a99f8
Tsung-Mao Fang
2022-04-14 15:26:00 +00:00
61eb591020
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5 am: 6c02827b8b
Tsung-Mao Fang
2022-04-14 15:25:27 +00:00
3ea4a22742
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6883e565c5 -s ours
Bill Yi
2022-04-14 15:19:24 +00:00
6484c18b7e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07026fd881 -s ours
Bill Yi
2022-04-14 15:19:19 +00:00
261e0d6841
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f31fac340 -s ours
Bill Yi
2022-04-14 15:18:58 +00:00
907985d3b2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13668c29ae -s ours
Bill Yi
2022-04-14 15:18:56 +00:00
d6c946ae2c
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9 am: fe2e6b19d8 am: b4dc55d47b
YK Hung
2022-04-14 15:17:17 +00:00
6883e565c5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
Bill Yi
2022-04-14 15:13:58 +00:00
5f31fac340
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
Bill Yi
2022-04-14 15:08:42 +00:00
c32da5ff90
Merge "Import translations. DO NOT MERGE ANYWHERE"
Bill Yi
2022-04-14 15:07:16 +00:00
de992a99f8
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5
Tsung-Mao Fang
2022-04-14 15:05:45 +00:00
6c02827b8b
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5
Tsung-Mao Fang
2022-04-14 15:04:40 +00:00
9c55b7ac47
Merge "Import translations. DO NOT MERGE ANYWHERE"
Bill Yi
2022-04-14 15:03:32 +00:00
b4dc55d47b
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9 am: fe2e6b19d8
YK Hung
2022-04-14 14:55:05 +00:00
5c13bfb2cb
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9 am: 2fbedfdb5d
YK Hung
2022-04-14 14:54:18 +00:00
1ccbf8b7d5
Add hyphenation to customize button text.
Lucas Silva
2022-04-14 10:45:22 -04:00
7877c073e5
Merge "Use androidx.window from prebuilt." into tm-dev
Tsung-Mao Fang
2022-04-14 14:40:21 +00:00
fe2e6b19d8
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9
YK Hung
2022-04-14 14:33:31 +00:00
2fbedfdb5d
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9
YK Hung
2022-04-14 14:32:22 +00:00
3a08246bd9
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev
YK Hung
2022-04-14 14:12:33 +00:00
7a8ac683d4
Fix logic used for auto time zone settings
Neil Fuller
2022-04-12 17:37:06 +01:00
39972db17d
Pass the activtiy launch flags into the AdvancedPowerUsageDetail
ykhung
2022-04-14 19:57:14 +08:00
113583c673
[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: 1612f73d2d -s ours
SongFerng Wang
2022-04-14 11:53:17 +00:00
25089086f0
[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: d6b4e5277f -s ours
SongFerngWang
2022-04-14 11:53:15 +00:00
6cd3bdcccc
[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: f77becc321 -s ours
SongFerngWang
2022-04-14 11:53:14 +00:00
5428c530c1
[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: 00b8ee8f12 -s ours
SongFerngWang
2022-04-14 11:53:13 +00:00
e500e7250b
[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: ff051a1de9 -s ours
SongFerngWang
2022-04-14 11:53:12 +00:00
d522c5f619
[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: 6933e9844d -s ours
SongFerngWang
2022-04-14 11:53:10 +00:00
0c669a9605
[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: 3da19ba9f5 -s ours
SongFerngWang
2022-04-14 11:53:09 +00:00
e68eec0906
[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: 0e702ee172 -s ours
SongFerngWang
2022-04-14 11:53:08 +00:00
92cfa3ba88
[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: bf6f75d976 -s ours
SongFerngWang
2022-04-14 11:53:07 +00:00
76e1d1e093
[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: bbdb6330ba -s ours
SongFerngWang
2022-04-14 11:53:06 +00:00
506af3b5c8
[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: 9d394ff979 -s ours
SongFerngWang
2022-04-14 11:53:04 +00:00
e1dd1ee341
[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: 5dd5f5c555 -s ours
SongFerngWang
2022-04-14 11:53:03 +00:00
d7d2dd07a4
[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: 29f5a6faa9 -s ours
SongFerngWang
2022-04-14 11:53:02 +00:00
6d36b41f7c
[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: bed126e923 -s ours
SongFerngWang
2022-04-14 11:53:01 +00:00
03bb71ef58
Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d am: b1166a441c am: 8cde4c0745 am: a10d61b60f
SongFerng Wang
2022-04-14 11:49:49 +00:00
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
SongFerng Wang
2022-04-14 11:31:16 +00:00
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
SongFerngWang
2022-04-14 11:31:15 +00:00
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
SongFerngWang
2022-04-14 11:31:14 +00:00
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
SongFerngWang
2022-04-14 11:31:13 +00:00
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
SongFerngWang
2022-04-14 11:31:12 +00:00
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
SongFerngWang
2022-04-14 11:31:11 +00:00
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
SongFerngWang
2022-04-14 11:31:09 +00:00
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
SongFerngWang
2022-04-14 11:31:08 +00:00
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
SongFerngWang
2022-04-14 11:31:07 +00:00
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
SongFerngWang
2022-04-14 11:31:06 +00:00
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
SongFerngWang
2022-04-14 11:31:04 +00:00
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
SongFerngWang
2022-04-14 11:31:03 +00:00
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
SongFerngWang
2022-04-14 11:31:02 +00:00
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
SongFerng Wang
2022-04-14 11:31:01 +00:00
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
SongFerngWang
2022-04-14 11:31:01 +00:00
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
SongFerngWang
2022-04-14 11:31:00 +00:00
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
SongFerngWang
2022-04-14 11:30:58 +00:00
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
SongFerngWang
2022-04-14 11:30:57 +00:00
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
SongFerngWang
2022-04-14 11:30:56 +00:00
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
SongFerngWang
2022-04-14 11:30:55 +00:00
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
SongFerngWang
2022-04-14 11:30:54 +00:00
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
SongFerngWang
2022-04-14 11:30:52 +00:00
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
SongFerngWang
2022-04-14 11:30:51 +00:00
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
SongFerngWang
2022-04-14 11:30:50 +00:00
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
SongFerngWang
2022-04-14 11:30:49 +00:00
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
SongFerngWang
2022-04-14 11:30:48 +00:00
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
SongFerngWang
2022-04-14 11:30:46 +00:00
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
SongFerngWang
2022-04-14 11:30:45 +00:00
a10d61b60f
Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d am: b1166a441c am: 8cde4c0745
SongFerng Wang
2022-04-14 11:30:03 +00:00
89ea026791
Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d am: b1166a441c am: 52052bd1b4
SongFerng Wang
2022-04-14 11:29:01 +00:00
bf81ecd75f
When in guest mode hide the rename button
Hugh Chen
2022-04-14 06:32:10 +00:00
97b86392fb
[automerger skipped] Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182 am: 9d10f0a9fb -s ours am: 68defd99f1 -s ours
SongFerng Wang
2022-04-14 10:35:23 +00:00
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
SongFerngWang
2022-04-14 10:35:22 +00:00
cc06f67db0
[automerger skipped] [MEP] psim's logical slot index is 0 am: 2479c9f7bd am: 83311b6208 am: bca382eefb -s ours am: f137d36ea7 -s ours
SongFerngWang
2022-04-14 10:35:21 +00:00
bd457c3c5c
[automerger skipped] [MEP] The condition of "null point check" is wrong am: 5c0df6913b am: 6a0742b2fb am: ffdf3513ec -s ours am: d625370f83 -s ours
SongFerngWang
2022-04-14 10:35:19 +00:00
8c636211e4
[automerger skipped] Fix the settings crash when SimDialogActivity is null am: d786b64ff6 am: a800c05ac7 am: d65110a8ff -s ours am: 444690e5ec -s ours
SongFerngWang
2022-04-14 10:35:18 +00:00
044697cd7d
[automerger skipped] [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8 am: bfe417ee13 am: 56f8390f6e -s ours am: 3b41ab2116 -s ours
SongFerngWang
2022-04-14 10:35:17 +00:00
30af06f976
[automerger skipped] [MEP] the port id is wrong am: 9ee91da8e1 am: f80bc78252 am: b8a9355134 -s ours am: 9d3385835f -s ours
SongFerngWang
2022-04-14 10:35:16 +00:00
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
SongFerngWang
2022-04-14 10:35:15 +00:00
1f91638bfc
[automerger skipped] [MEP] Refactor SlotSidecar API for all of sim page. am: 3597302ae1 am: f54b0ca79f am: bb912216d7 -s ours am: c4c07f8b8b -s ours
SongFerngWang
2022-04-14 10:35:13 +00:00
e4eb489087
[automerger skipped] [MEP]The Esim's PhysicalSlotIndex is wrong am: d3f3730721 am: f795e9b6d0 am: 4d039eaefc -s ours am: 06090f9837 -s ours
SongFerngWang
2022-04-14 10:35:12 +00:00
0b4df9c03f
[automerger skipped] Lost code for setting the list as visible am: 130b739ed1 am: 2b02a6f3d2 am: 094ba6c077 -s ours am: c72a358a86 -s ours
SongFerngWang
2022-04-14 10:35:11 +00:00
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
SongFerngWang
2022-04-14 10:35:10 +00:00
5b8ece05f8
[automerger skipped] The carrier name is wrong in the dialog am: f513452d4b am: c70bde0995 am: d4ca5a289f -s ours am: e194be8946 -s ours
SongFerngWang
2022-04-14 10:35:09 +00:00
3983b43715
[automerger skipped] Refine the mobile data selection UI am: 964c7d5eaf am: d4b95990e9 am: de8a16419e -s ours am: e630379229 -s ours
SongFerngWang
2022-04-14 10:35:07 +00:00
f5be6b7a9c
Merge "[Panlingual] Add a description for per app language." into tm-dev am: b18b106300 am: 727e101ee5 am: 6f7ea55682
Tom Hsu
2022-04-14 10:34:43 +00:00
8cde4c0745
Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d am: b1166a441c
SongFerng Wang
2022-04-14 10:34:43 +00:00
9b8939238a
[automerger skipped] Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182 am: 9d10f0a9fb -s ours am: 68defd99f1 -s ours
SongFerng Wang
2022-04-14 10:34:33 +00:00
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
SongFerngWang
2022-04-14 10:34:31 +00:00