Bonian Chen
f1f31c5cac
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 am: d9f98f935b
...
Change-Id: I944102b069e7a983e4067f95505f4ef8c2be7043
2020-04-01 07:29:46 +00:00
Bonian Chen
3f6f4e44e0
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 am: 98f1a405c6
...
Change-Id: Ic20177035e6902b8d55c52baa039f540bdd574ac
2020-04-01 07:29:24 +00:00
Arc Wang
26d3b7dd1b
[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test
...
Sign in feature is integrated in WifiTraclerLib, change the test cases
to verify if WifiEntry sign in methods is called.
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ia0157f5a96c700e5596c00cef873c8f5016d6442
2020-04-01 15:25:37 +08:00
Bonian Chen
d9f98f935b
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5
...
Change-Id: I3687e0c1884ea802801c3eb00aafe933428cb817
2020-04-01 07:17:07 +00:00
Bonian Chen
98f1a405c6
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5
...
Change-Id: I9bc040d577318ffdec9ff8bd0634e766d2774b8b
2020-04-01 07:16:47 +00:00
Bonian Chen
cfbdcaf9f5
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev
2020-04-01 07:00:15 +00:00
TreeHugger Robot
387f1241a1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: d9a0046fd6 -s ours am: 99d4f7fb02 -s ours am: e124d8caa3 -s ours am: 0123fcdcd3 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iaa2efdbc14a127e4bbaa9a5e6e96d5814cebe410
2020-04-01 06:20:38 +00:00
TreeHugger Robot
0123fcdcd3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: d9a0046fd6 -s ours am: 99d4f7fb02 -s ours am: e124d8caa3 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I54f7091ddd74fec21395d51f5152b5b0db5f36b2
2020-04-01 06:15:44 +00:00
TreeHugger Robot
393f239e3d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: 80036cffa9 -s ours am: f444344c5d -s ours am: 37417cc4f8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I360a99d11e57d86e111a4791340eda96134b0f26
2020-04-01 06:15:41 +00:00
TreeHugger Robot
16b8962e7b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: d9a0046fd6 -s ours am: 93d950aa04 -s ours am: 2815ffd722 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I52b6394b7c2cd109a4d7be0efb32859801bc112d
2020-04-01 06:15:25 +00:00
TreeHugger Robot
37417cc4f8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: 80036cffa9 -s ours am: f444344c5d -s ours
...
am skip reason: subject contains skip directive
Change-Id: I7e4c736329e67a4d44e759946b47f9870f2516a2
2020-04-01 05:57:20 +00:00
TreeHugger Robot
e124d8caa3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: d9a0046fd6 -s ours am: 99d4f7fb02 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Icce74295aba2d2fa30c978c8b9df11c42b73ef64
2020-04-01 05:57:15 +00:00
TreeHugger Robot
2815ffd722
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: d9a0046fd6 -s ours am: 93d950aa04 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iea49ae5df51369ef274cf9dd690656167cc540c0
2020-04-01 05:57:05 +00:00
TreeHugger Robot
99d4f7fb02
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: d9a0046fd6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib60a65ab9435d37fafbd92a6c4504202e8d4b066
2020-04-01 05:44:37 +00:00
TreeHugger Robot
f444344c5d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: 80036cffa9 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I12e9cdb4c20c5e5b6519a14553af0397ed60d11c
2020-04-01 05:44:28 +00:00
TreeHugger Robot
93d950aa04
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: d9a0046fd6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iea664fae56e6e1822567ec0c7564b9c1f826b2bc
2020-04-01 05:44:10 +00:00
TreeHugger Robot
80036cffa9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours
...
am skip reason: subject contains skip directive
Change-Id: I195e28633ce35791208174a7b3d61eb83dadbcdb
2020-04-01 05:32:13 +00:00
TreeHugger Robot
d9a0046fd6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id41bbf1c7274c0475b5ed29577a88c17559ca9fa
2020-04-01 05:31:47 +00:00
TreeHugger Robot
58cadcc6ee
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-04-01 05:13:22 +00:00
Goven Liu
ff48763ecf
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb am: ea63069e93 am: 05dd6664e2 am: 0bda2083c6
...
Change-Id: I617592e93b0cf2745ba33267960f8d06828345cd
2020-04-01 04:16:07 +00:00
Automerger Merge Worker
857e893a16
Merge "Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 336834b17e" into rvc-d1-dev-plus-aosp am: 0295e02499 am: 286db1ad12
...
Change-Id: I0aed0cc6b887523130c8b6bd3b8c279bcba08be6
2020-04-01 04:15:55 +00:00
Goven Liu
0bda2083c6
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb am: ea63069e93 am: 05dd6664e2
...
Change-Id: Ie4e7e1b205ca3dce9b05af7fd8058b67756a6b03
2020-04-01 04:15:34 +00:00
Goven Liu
8875f3bdf1
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb am: 4b67490445 am: dbc337b4c5
...
Change-Id: I07c7dde25a3c28f1ac01151103a4fb0f518655bf
2020-04-01 04:15:29 +00:00
Bonian Chen
bd03b17a62
[Settings] Avoid from crash when pull out SIM
...
Avoid from crash through exception handling.
Bug: 148803073
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest
Change-Id: I10aff50b6f3fc50b2f336ee320740f9f4a81e256
2020-04-01 12:05:38 +08:00
Automerger Merge Worker
286db1ad12
Merge "Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 336834b17e" into rvc-d1-dev-plus-aosp am: 0295e02499
...
Change-Id: Iabf6d8ca41146b92fe1b488fcfa71b5115248bf4
2020-04-01 04:01:14 +00:00
Goven Liu
dbc337b4c5
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb am: 4b67490445
...
Change-Id: I035849dc12342937d00c55aa727116bc626322ab
2020-04-01 04:00:58 +00:00
Goven Liu
05dd6664e2
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb am: ea63069e93
...
Change-Id: I7ba160b65ec57f33f0c30afc88e34e9f2a74f8d1
2020-04-01 04:00:56 +00:00
Bill Yi
20e0cbec41
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I3d6289030419addc1ccd223de40be5e1bc422df8
2020-03-31 20:55:13 -07:00
Automerger Merge Worker
0295e02499
Merge "Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 336834b17e" into rvc-d1-dev-plus-aosp
2020-04-01 03:49:43 +00:00
Goven Liu
4b67490445
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb
...
Change-Id: I4409afa7c65bbf7d6d5ac051b8ebd7e258bedf91
2020-04-01 03:49:40 +00:00
Goven Liu
d0bc27f31e
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 336834b17e
...
Change-Id: Id059dbb0a8fc61d225f2efff917cba62dd3822d3
2020-04-01 03:49:40 +00:00
Goven Liu
ea63069e93
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb
...
Change-Id: I9c8ede2f1ddf8e3f763caf0d68f2a7a586db20ab
2020-04-01 03:49:28 +00:00
Goven Liu
336834b17e
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
...
Change-Id: I4d369739d3d83771f220cacb1846338056367969
2020-04-01 03:36:29 +00:00
Goven Liu
15ff53ecfb
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
...
Change-Id: I681ff5a91c45eca3d6f80dc61aed8907d08842b5
2020-04-01 03:36:05 +00:00
Goven Liu
783b0257ad
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev
2020-04-01 03:16:34 +00:00
Bill Yi
5f16525806
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ie47208d5573659f3bdcc57c8d9933a2245625669
2020-03-31 20:12:42 -07:00
Bonian Chen
39ff4e4495
[Settings] Code Refactor
...
1. Code refactor for android.telephony.ims.ImsManager.
2. Remove unused methods
Bug: 140542283
Test: build pass
Change-Id: I187789a8a553a2c073b3591807dfebfafba6bc14
2020-04-01 10:58:27 +08:00
Weilun Du
08e95d0db0
[Settings] Fix crashes caused by null bluetooth adapter and ethernet
...
manager
Emulator system image doesn't support bluetooth and ethernet manager
yet.
BUG: 150408099
Signed-off-by: Weilun Du <wdu@google.com >
Change-Id: Iab4f7b962f01755fe7d84956f9b54374f1e17408
2020-04-01 02:39:28 +00:00
Malcolm Chen
0b2b2b50d7
Update string of showing conflict between 5G and DSDS.
...
Bug: 152786064
Test: manual
Change-Id: I3ab8dc326caff5b7480c17b9a8004ed91a8b0578
2020-03-31 17:19:16 -07:00
Sarah Chin
f338218348
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours am: 902793ffa7 -s ours am: 8f14309c6a -s ours am: 1a963d5f96 -s ours
...
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0
2020-04-01 00:03:14 +00:00
Sarah Chin
1a963d5f96
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours am: 902793ffa7 -s ours am: 8f14309c6a -s ours
...
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0
2020-04-01 00:02:14 +00:00
Sarah Chin
8f14309c6a
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours am: 902793ffa7 -s ours
...
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0
2020-03-31 23:40:46 +00:00
Sarah Chin
902793ffa7
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours
...
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0
2020-03-31 23:26:57 +00:00
Sarah Chin
c03048cd27
Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a
...
Change-Id: Ibd354d26acab6e5f8195d4f93b302ec9c362d9be
2020-03-31 23:15:07 +00:00
Sarah Chin
b6fd42a06a
Merge "Rename calls to isGlobalModeEnabled"
2020-03-31 23:02:20 +00:00
Brad Ebinger
05733f933e
[automerger skipped] Merge changes I06df2928,I70821964 am: 24ddbf5e8c am: 8bc35321d8 -s ours am: 2139c0b50a -s ours am: 41df03ff47 -s ours am: 7f9b393ead -s ours
...
am skip reason: Change-Id I06df2928116b33fec39aade733401d60e6cde1c1 with SHA-1 60204898ec
2020-03-31 21:53:56 +00:00
Brad Ebinger
74e520cbf7
[automerger skipped] Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a am: da1335a9f4 -s ours am: 5ef4a92dd0 -s ours am: 3d3a32d3dd -s ours am: 2d3a0393d4 -s ours
...
am skip reason: Change-Id I70821964bc618c3c389c9039cd7f5028e34c7ebb with SHA-1 66c709844a
2020-03-31 21:53:54 +00:00
TreeHugger Robot
6554b8ab18
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: 0d78f267d8 am: 0b06034144 am: a168a5dee5
...
Change-Id: Ic45286b6b04419ede03fb8eb01533d7fb41ddac1
2020-03-31 21:53:32 +00:00
Automerger Merge Worker
3cce9c0a98
Merge "Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2 am: 6c2f6a3e0a am: b7690b92fb" into rvc-qpr-dev-plus-aosp am: 34f9c3d17d
...
Change-Id: I98ca16e89738bc1567286e6fcb99b239fd9fb7a0
2020-03-31 21:53:12 +00:00
TreeHugger Robot
6afd1ed7ef
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: c823a3169b am: d4aa412835 am: d444d8b9c3
...
Change-Id: I29e84a1a773ecc25c3ee4625280a5cf75b7888f3
2020-03-31 21:52:47 +00:00
