Bonian Chen
eda7705565
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595
am: 0b1cc9979e
am: c39805c32e
...
Change-Id: I1c64a207244dfdb3099ca08393cbfa02f7aa7c97
2020-04-01 16:54:57 +00:00
Bonian Chen
fa41f98986
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595
am: 5d88416ee0
am: ac48e7c606
...
Change-Id: I91e0f5f832729c4844a338ce85ccc66e807d803a
2020-04-01 16:54:16 +00:00
Bonian Chen
c39805c32e
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595
am: 0b1cc9979e
...
Change-Id: I796e56b08a0fe9a6e34b95e19e585a3e1e98e830
2020-04-01 16:34:26 +00:00
Bonian Chen
ac48e7c606
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595
am: 5d88416ee0
...
Change-Id: Id9ee5713de1bb803ae74cf43e2bc2d7b3f3d8803
2020-04-01 16:33:59 +00:00
Bonian Chen
0b1cc9979e
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595
...
Change-Id: I06dcc9e2304a4fdb04ce9ba1dd30fb96e8045a2d
2020-04-01 16:19:07 +00:00
Bonian Chen
5d88416ee0
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595
...
Change-Id: I64e7a3b6c251626620a3b77cb91b68e6a1c26dd1
2020-04-01 16:18:52 +00:00
Bonian Chen
0d3732a595
Merge "[Settings] Code Refactor" into rvc-dev
2020-04-01 16:07:47 +00:00
TreeHugger Robot
2f9f81cba9
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4
am: da8eb18b3d
am: 1c4ac1dded
am: 058907083f
...
Change-Id: Iedc8db9f123e78fe3445d3f625648edfd969b71a
2020-04-01 10:44:44 +00:00
TreeHugger Robot
761c9b2078
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4
am: 6b7d3f8290
am: 6243bd9fce
...
Change-Id: I01da76c7c8e78389c0cffb75a91f4c233683fba3
2020-04-01 10:32:10 +00:00
TreeHugger Robot
c8979ad780
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4
am: da8eb18b3d
am: 010f812a43
...
Change-Id: Ibeb439c4d1f3c1ed70ca340e8c47a4f716846e9e
2020-04-01 10:31:58 +00:00
TreeHugger Robot
058907083f
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4
am: da8eb18b3d
am: 1c4ac1dded
...
Change-Id: Iadcf67208672f37c3ee522924ced8841e03723c1
2020-04-01 10:31:56 +00:00
TreeHugger Robot
6243bd9fce
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4
am: 6b7d3f8290
...
Change-Id: I6699e559e4e587bacd1d46c477f494af88423109
2020-04-01 10:14:42 +00:00
TreeHugger Robot
1c4ac1dded
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4
am: da8eb18b3d
...
Change-Id: Ie6730d17b2c868be31ae164768dcbeb85e42e8c2
2020-04-01 10:14:41 +00:00
TreeHugger Robot
010f812a43
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4
am: da8eb18b3d
...
Change-Id: I5823b17e494a83fb7df031b82217a9cd4ef3ea3c
2020-04-01 10:14:14 +00:00
TreeHugger Robot
6b7d3f8290
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4
...
Change-Id: Ic1243f986b4c236c14c0c840fe7069d9557c35bc
2020-04-01 09:52:54 +00:00
TreeHugger Robot
da8eb18b3d
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4
...
Change-Id: I22b80f8c34280390e8f7797e50172967494dff1e
2020-04-01 09:52:32 +00:00
TreeHugger Robot
93162ce9f4
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev
2020-04-01 09:39:12 +00:00
Bonian Chen
c4d11f0aeb
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5
am: 98f1a405c6
am: bc39d3254a
am: e054fb5bf5
...
Change-Id: I5d6799e927a0188e9a3100a31929bf973923332d
2020-04-01 08:05:53 +00:00
Bonian Chen
39b3c1b53c
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5
am: d9f98f935b
am: f1f31c5cac
...
Change-Id: I8e4902463639fa40d5667dd31826320cd5e04cb2
2020-04-01 07:51:01 +00:00
Bonian Chen
e054fb5bf5
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5
am: 98f1a405c6
am: bc39d3254a
...
Change-Id: If38021c87fc1dcfadd4debf42f698cd87ceeca67
2020-04-01 07:50:50 +00:00
Bonian Chen
41bc6897c1
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5
am: 98f1a405c6
am: 3f6f4e44e0
...
Change-Id: I35eb3232818ff4e7ab554107d2c9ff8fb5fdcb6e
2020-04-01 07:50:47 +00:00
Bonian Chen
bc39d3254a
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5
am: 98f1a405c6
...
Change-Id: Ic91aab7738256794d63bf5c016e7e4e8d258c1f2
2020-04-01 07:29:46 +00:00
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
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
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
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
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
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