Kholoud Mohamed
0329f2fcbe
Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a
am: bf7e468f0c
am: 14d05685a1
...
Change-Id: Ic8267c53e159a2a6b6d10435d12b8dff68ae4d7f
2020-03-31 13:52:23 +00:00
Kholoud Mohamed
14d05685a1
Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a
am: bf7e468f0c
...
Change-Id: I7e9a11c33a7fecdeaa52ac0a6f5363ddb7971862
2020-03-31 13:38:47 +00:00
Kholoud Mohamed
bf7e468f0c
Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a
...
Change-Id: I7310a64ae95e0fdaf191b979cacefb8ad645d53a
2020-03-31 13:26:09 +00:00
Kholoud Mohamed
7fb6f35c3a
Merge "Show all apps that requested cross profile permission" into rvc-dev
2020-03-31 13:09:31 +00:00
Alex Kershaw
c364f5d95d
Remove policy transparency for cross-profile calendar setting
...
We will likely deprecate this setting in the next release, to be
replaced by usage of 'connected work and personal apps'. However, we are
keeping it in this release as it's still possible that a lightweight
calendar access API could be useful, if the admin and user approvals are
combined.
For now, the error message that refers to cross-profile calendar when
the setting is disabled is confusing admins, since we're not
recommending usage of this API at this time.
Remove the setting when it is disabled, rather than showing policy
transparency.
Fixes: 143477431
Test: manual
Change-Id: I65573a5ba892e12a4dabcdf23541f33516db0a8a
2020-03-31 11:41:44 +01:00
Robert Luo
ef548f8629
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
am: c13ecfad98
am: f2dbeb1542
am: b6e34349de
...
Change-Id: I1f2c9eeb61e509a27a52907f399b88a41f75cdea
2020-03-31 10:00:49 +00:00
Bonian Chen
f35562af9a
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
am: 949ec8a1f0
am: 155c698d4f
am: a170198f0b
...
Change-Id: Ifdb5aa5bb04191ce3d00b3d9f885ef6fd2664971
2020-03-31 09:59:51 +00:00
TreeHugger Robot
5ef48cf252
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
am: 46cc33c9a6
am: 7fea1bf993
am: faff3e2276
...
Change-Id: Ia5e0c4df1c191dc7c5018b6e34be63471e66e999
2020-03-31 09:58:17 +00:00
TreeHugger Robot
3087ed5a7f
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
am: 2093f0dee4
am: 52162fde91
am: 545c95317c
...
Change-Id: Ib17d078be14398df69d55a430602434a4c6b8877
2020-03-31 09:54:13 +00:00
tim peng
0c9505da84
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
am: 4a82a5abb5
am: 1106c19951
am: 774620f543
...
Change-Id: Iaf2f09df206b561dc4478d8f730e27b9944236e7
2020-03-31 09:27:37 +00:00
Arc Wang
a76669656f
[Wi-Fi] Wi-Fi picker scrolls to top after a user clicked to connect
...
After a connect success callback, Wi-Fi picker scrolls to the connected
Wi-Fi network after it's added in.
Bug: 152576795
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2
manual
Click a Wi-Fi network or it's context menu 'Connect' button
to connect and see if UI scroll to the top.
Change-Id: Ia96af86c9ed552324089f97db104975e28f6c1c7
2020-03-31 17:24:54 +08:00
Arc Wang
3bb3808043
[Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button
...
1. Display the Wi-Fi dialog with MODE_CONNECT.
2. Connect with the WifiConfiguration from
WifiConfigController2#getConfig() if it's available.
Bug: 152826354
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2
Change-Id: Ifbe2ac30b1c37c8eab3227ac0561fdd2de5cb706
2020-03-31 17:01:22 +08:00
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
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
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
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
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
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