Robert Luo
b6e34349de
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
am: c13ecfad98
am: f2dbeb1542
...
Change-Id: Ie893d9a5c9858c743f18434f093aba1f03d24d33
2020-03-31 08:34:19 +00:00
Robert Luo
6271d783df
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
am: c13ecfad98
am: 9fc4bfdcb5
...
Change-Id: I205f7b781f7c2a2ce955d99e82915c25fc6e5b66
2020-03-31 08:34:19 +00:00
Robert Luo
f2dbeb1542
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
am: c13ecfad98
...
Change-Id: I265d9fdf691f443319417d4cf24b91b0223824d3
2020-03-31 08:19:39 +00:00
Robert Luo
9fc4bfdcb5
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
am: c13ecfad98
...
Change-Id: I82be8b4c9c8a2929aac7570c198a2fed2c0eafc1
2020-03-31 08:19:18 +00:00
Robert Luo
f62beedb4f
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
...
Change-Id: I556aee40bc3bda47351788aa63ad63bfc43a6f6b
2020-03-31 08:02:19 +00:00
Robert Luo
c13ecfad98
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
...
Change-Id: Ibf6f65fc9659992bb7da934f2f39572b3f108ac2
2020-03-31 08:01:50 +00:00
Robert Luo
c3535eab06
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev
2020-03-31 07:42:24 +00:00
Bonian Chen
3c4dffc470
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
am: 949ec8a1f0
am: 9e9597f7d8
...
Change-Id: Ibb3fe8013b6de42c2aa2526b6a2e40e3ec3e1a95
2020-03-31 07:15:48 +00:00
Bonian Chen
a170198f0b
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
am: 949ec8a1f0
am: 155c698d4f
...
Change-Id: I35c153ff8ecf7b9505e87ac4fd9e2ffa7fa7a491
2020-03-31 07:15:23 +00:00
Bonian Chen
155c698d4f
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
am: 949ec8a1f0
...
Change-Id: Ie800cbe35040ed63a8488e7cac8e1bfdfdadb8a4
2020-03-31 07:00:57 +00:00
Bonian Chen
9e9597f7d8
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
am: 949ec8a1f0
...
Change-Id: I3fbf2b0e9a69d08c5926ce05d2bef76d36e6f84f
2020-03-31 07:00:18 +00:00
Bonian Chen
7520adccee
[Settings] Apply WifiCallingQueryImsState
...
Apply design of WifiCallingQueryImsState to source code which accessing
WifiCalling.
Bug: 140542283
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: I0db966742d63cfe9a1ef4e1b06f6b5c81f681927
2020-03-31 14:40:18 +08:00
Bonian Chen
9dda57cd21
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
...
Change-Id: I86c84f03fedfbaae24f377552c5998fc9b31cce4
2020-03-31 06:39:41 +00:00
Bonian Chen
949ec8a1f0
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
...
Change-Id: Ib23864723f76e376338604b65171a058cc0df611
2020-03-31 06:39:12 +00:00
Bonian Chen
268bdc12c6
Merge "[Settings] Code Refactor" into rvc-dev
2020-03-31 06:24:15 +00:00
TreeHugger Robot
faff3e2276
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
am: 46cc33c9a6
am: 7fea1bf993
...
Change-Id: I12ec3f1aeddac3cda3ba300057094cf3aa64105b
2020-03-31 05:16:00 +00:00
TreeHugger Robot
bebee5c18e
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
am: 46cc33c9a6
am: 210c260ce6
...
Change-Id: Ib374cc0970383c55e61a76fe941a8fbfa8963dc1
2020-03-31 05:15:32 +00:00
TreeHugger Robot
7fea1bf993
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
am: 46cc33c9a6
...
Change-Id: Id213c4a4ffdd6bc57fc45e6956660b92d725a75e
2020-03-31 05:04:30 +00:00
TreeHugger Robot
210c260ce6
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
am: 46cc33c9a6
...
Change-Id: Ied6e18f0806b1f32fb3adcec483adc34eb7a23aa
2020-03-31 05:04:21 +00:00
TreeHugger Robot
820d35b59a
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
...
Change-Id: I1cd9eb45833c4a572a98b8b8996bc8512f92c069
2020-03-31 04:43:08 +00:00
TreeHugger Robot
46cc33c9a6
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
...
Change-Id: I066c17625736fd8cdaa96068a2bc5accdb5ae3fc
2020-03-31 04:42:59 +00:00
TreeHugger Robot
cd329951ba
Merge "Get MediaDevice from devices list" into rvc-dev
2020-03-31 04:26:31 +00:00
Bonian Chen
21475ae6c6
[Settings] Code Refactor
...
Code refactor in order to support auto testing
Bug: 140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Change-Id: I2427732435b59d7359a102e0dd56317ac6a024b4
2020-03-31 03:46:45 +00:00
TreeHugger Robot
545c95317c
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
am: 2093f0dee4
am: 52162fde91
...
Change-Id: Ic19955a29105435d67c7f586e76ce8d4a1aef858
2020-03-31 03:13:58 +00:00
TreeHugger Robot
ab9a994fcd
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
am: 2093f0dee4
am: 1e2a313c5a
...
Change-Id: Idcfa5ac8d980dbf8a8b01b177d58278e665b08e1
2020-03-31 03:13:45 +00:00
TreeHugger Robot
52162fde91
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
am: 2093f0dee4
...
Change-Id: Ief6b6435ad6b344c9fecaa12af0ff83e3e680199
2020-03-31 03:13:39 +00:00
TreeHugger Robot
1e2a313c5a
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
am: 2093f0dee4
...
Change-Id: I9d0663c100944dcced8ae20d0d38c6ba3364182d
2020-03-31 03:13:38 +00:00
tim peng
f8c57507e2
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
am: 4a82a5abb5
am: 2b47660696
...
Change-Id: I441ae31c111143bfd5dea06e2179e1644d86ca52
2020-03-31 03:13:25 +00:00
tim peng
774620f543
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
am: 4a82a5abb5
am: 1106c19951
...
Change-Id: Ie11c1cc084213b3196d97ef0eca0f7fa018288a6
2020-03-31 03:13:08 +00:00
TreeHugger Robot
58920061b1
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
...
Change-Id: I7658df2b27aa43f948739d06bf7cf18b94b5391d
2020-03-31 02:51:20 +00:00
TreeHugger Robot
2093f0dee4
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
...
Change-Id: Ia47c8ea68d5b5709e1aa82930ea38ab61f0c7222
2020-03-31 02:51:01 +00:00
tim peng
1106c19951
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
am: 4a82a5abb5
...
Change-Id: I13e4e901bd2e6a462e2ad7ba29077aa79255d018
2020-03-31 02:45:01 +00:00
tim peng
2b47660696
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
am: 4a82a5abb5
...
Change-Id: I3976f109e633f10b6b91b8f756588be561bcb187
2020-03-31 02:44:50 +00:00
TreeHugger Robot
477c4fef48
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev
2020-03-31 02:34:51 +00:00
tim peng
5c81b237cd
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
...
Change-Id: I77aeae7c8b4f3f6acafec0e6a05d6b1310f6cc50
2020-03-31 02:24:35 +00:00
tim peng
4a82a5abb5
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
...
Change-Id: Ic6c44c4ce05197d113f4f0718640f0abb868793e
2020-03-31 02:24:16 +00:00
tim peng
5b0913c2b6
Merge "No media status is visible in Output Switcher" into rvc-dev
2020-03-31 02:04:48 +00:00
Bonian Chen
bef5c99802
[Settings] Remove internal ImsManager access within MobileNetworkUtils
...
Remove the access of com.android.ims.ImsManager from MobileNetworkUtils.
Bug: 140542283
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: Id2550a11c185ac44c1f70c98929c4b1d659f9a0c
2020-03-31 09:41:40 +08:00
TreeHugger Robot
24848171d3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f
-s ours am: 7f94e44f55
-s ours am: 50699d4595
-s ours am: a383b959ac
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I77f95cfea42dcd2572c7d89cbbd24ae2472fffc5
2020-03-31 01:10:24 +00:00
TreeHugger Robot
fe1309d723
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f
-s ours am: 7f94e44f55
-s ours am: d87a2cb1f3
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I8369808c740c4be08c8ea250082fb1fdf23e4365
2020-03-31 00:50:51 +00:00
TreeHugger Robot
a383b959ac
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f
-s ours am: 7f94e44f55
-s ours am: 50699d4595
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I7a5fd91ca07762f44965e4a2873b92129a8e534a
2020-03-31 00:50:33 +00:00
TreeHugger Robot
50699d4595
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f
-s ours am: 7f94e44f55
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I660c2a7e46b4c055e417e955a9e9b99aadca3052
2020-03-31 00:25:29 +00:00
TreeHugger Robot
d87a2cb1f3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f
-s ours am: 7f94e44f55
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I71ff8fa319bb3b19f8c5828412159fc505262aed
2020-03-31 00:25:16 +00:00
TreeHugger Robot
7c4f2d2cc8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie27ed918d7405a42d2e49c3122f37f2c4862b554
2020-03-31 00:05:16 +00:00
TreeHugger Robot
7f94e44f55
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie75baff25f3026bfdb41b067769e7ffef4123eec
2020-03-31 00:04:51 +00:00
TreeHugger Robot
8c7a574507
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd
am: ea63b90c3d
am: 0c0dc0f64e
am: 931ea77cc3
...
Change-Id: Ifb47c6d171397534931b4dea4ae161be0e704beb
2020-03-30 23:45:27 +00:00
TreeHugger Robot
4a08ac176f
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-03-30 23:39:52 +00:00
TreeHugger Robot
931ea77cc3
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd
am: ea63b90c3d
am: 0c0dc0f64e
...
Change-Id: I18cfc1ccb3d631a90f4917fcb7ee976eee7cc0c3
2020-03-30 23:09:53 +00:00
TreeHugger Robot
0c0dc0f64e
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd
am: ea63b90c3d
...
Change-Id: Ibba92edec9c66ed27f37ceeb7eb6e891faa28ac2
2020-03-30 22:51:13 +00:00
TreeHugger Robot
599f02eab1
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd
am: ea63b90c3d
am: 4b997ee9fd
...
Change-Id: Icb82bc3fd94d56b94c275ad2bbb80b78b8bbf1dc
2020-03-30 22:13:07 +00:00