Commit Graph

10721 Commits

Author SHA1 Message Date
TreeHugger Robot
0aeda894f3 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 am: c5507e6665
Change-Id: Iea8e205dbdc145c6ccb268499bd7dce3137e0545
2020-03-31 18:07:33 +00:00
TreeHugger Robot
d0d3873aa7 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev 2020-03-31 17:31:16 +00:00
Bonian Chen
fa83a139ca Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: d2fe2c9959
Change-Id: I56e3d5cf3731b4188afbad5d88b8931b98fa21bf
2020-03-31 16:38:36 +00:00
Bonian Chen
54002ca154 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev 2020-03-31 16:09:27 +00:00
TreeHugger Robot
4bcd19b296 Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5
Change-Id: I4b3fa69ed60dbbd4fe936d463673ef8767fd982c
2020-03-31 15:34:52 +00:00
TreeHugger Robot
4b45334288 Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev
* changes:
  [Wi-Fi] Wi-Fi picker scrolls to top after a user clicked to connect
  [Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button
2020-03-31 15:01:09 +00:00
Kholoud Mohamed
3e5e6920eb Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c
Change-Id: I1fcaa7e6bd6616a5df7187c36575bc6f9abdf1f7
2020-03-31 13:52:36 +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
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
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
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
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
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
5b0913c2b6 Merge "No media status is visible in Output Switcher" into rvc-dev 2020-03-31 02:04:48 +00:00
TreeHugger Robot
4b997ee9fd Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d
Change-Id: Icbbe2f70adac63bf922dd66edb31760ae3efb851
2020-03-30 21:49:07 +00:00
TreeHugger Robot
a2d56af9bd Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev 2020-03-30 21:07:15 +00:00
TreeHugger Robot
8b94c0e4a3 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd
Change-Id: Ia96c24f21d404c3d043047aa68bc465f779a1114
2020-03-30 20:39:04 +00:00
Julia Reynolds
639b6f89ea Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec
Change-Id: I2ea539acf7f6427021016d7fe6d102e869cce456
2020-03-30 20:38:54 +00:00
kholoud mohamed
4d0edf369f Show all apps that requested cross profile permission
show all apps that requested the permission, show the admin
restricted dialog if the app is not whitelisted by the admin,
and show a link to install the app if the app is missing in one
of the profiles.

Bug: 149742043
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesDetailsTest

Change-Id: I2bc86b9966a2e14a12ee8f4b7f1b75f866ed98e3
2020-03-30 21:10:40 +01:00
TreeHugger Robot
6f837d10bf Merge "Don't filter demoted conversation from app subtext" into rvc-dev 2020-03-30 20:03:45 +00:00
Julia Reynolds
b3f2c0d528 Merge "Conversations can't individually bypass dnd" into rvc-dev 2020-03-30 19:57:48 +00:00
Yanting Yang
0c23dcd4ec Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: d8f14f11b0
Change-Id: Ia557b480b9519b0da3e84044c989072a4c90e47c
2020-03-30 18:51:51 +00:00
Bonian Chen
3205731765 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308 am: a6d6285b57
Change-Id: Iceb405d58331badd6ec62913287a5aa1f175bf15
2020-03-30 18:31:02 +00:00
tim peng
5201d1d163 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904 am: 15ac2b2c8e
Change-Id: I4da802d1ee9f3a994c42bf0392cd40bb1b23f319
2020-03-30 18:30:27 +00:00
Bonian Chen
ea44a49cfd [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4 am: 9c4d1190d9
Change-Id: Icf336c69791952c542c4c31d02a1da901e4db70e
2020-03-30 18:28:46 +00:00
tim peng
49480d1f53 Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c
Change-Id: Ib8b6ff0cd9dfc4ae2fdfd535354fcdd3fac5e261
2020-03-30 18:27:22 +00:00
Beverly
ef2c91c9a3 Don't filter demoted conversation from app subtext
If the notification channel is a demoted converation, we still want to
include it as a notification channel that can bypass DND under the
"apps" preference for DND.

Test: manual, make RunSettingsRoboTests7
Fixes: 152765113
Change-Id: Ief072b19280b0dc6e6c37d2d46d51f045d42bb4e
2020-03-30 14:01:38 -04:00
Julia Reynolds
56d0f6b03a Conversations can't individually bypass dnd
Test: atest
Fixes: 152482973
Change-Id: I19432b79724beca46974c1c88d42a231f0703dc7
2020-03-30 13:18:38 -04:00
Yanting Yang
ad4405d0f8 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev 2020-03-30 15:15:06 +00:00
Arc Wang
3aee35a882 [Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest
In ag/10785119, WifiStatusTracker#setListening calls
ConnectivityManager#unregisterNetworkCallback twice.
Modify the fail test to match it.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiMasterSwitchPreferenceControllerTest
Change-Id: Idd9917ce204e2abbc4bfbf760222191adadf4afa
2020-03-30 22:07:21 +08:00
Rubin Xu
fbfba7a078 Set face unlock toggle to unchecked when disabled by admin
Bug: 135747161
Test: make RunSettingsRoboTests
    ROBOTEST_FILTER=FaceSettingsLockscreenBypassPreferenceControllerTest
Change-Id: I1e3d105184a14bfece972abb096eac44bd186273
2020-03-30 12:33:57 +01:00
Tim Peng
3ac144163e No media status is visible in Output Switcher
-Reflash header when get latest media controller

Bug: 152606491
Test: make -j42 RunSettingsRoboTests
Change-Id: I14542a7f8ba921c9d1dbaacf7e01c3ee673527b2
2020-03-30 16:20:14 +08:00
Bonian Chen
fb7274a308 [Settings] Replace ImsManager#isVtEnabledByPlatform()
Replace ImsManager#isVtEnabledByPlatform() by
ImsMmTelManager.isSupported().

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=VideoCallingPreferenceControllerTest

Change-Id: Ife5100ef288fbad6fc818e8fbdf8192c42d495b2
2020-03-30 07:41:29 +00:00
tim peng
ecea133904 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev 2020-03-30 06:56:16 +00:00
Tim Peng
e4ccbbec67 PendingIntent in MediaOutputIndicatorSlice could be Hijacked
-Add setPackage() to prevent local information disclosure

Bug: 151645695
Test: make -j42 RunSettingsRoboTests
Change-Id: I74c058a381fceb85695dd76d354fb49f878f9142
2020-03-30 03:53:02 +00:00
Bonian Chen
c134ef08d4 [Settings] Replace ImsManager#isWfcEnabledByPlatform()
Replace ImsManager#isWfcEnabledByPlatform().

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest

Change-Id: I85907efb39aecdb3fb18cacf11ce4510b898edc4
2020-03-30 03:34:01 +00:00
tim peng
ddd8a8fa92 Merge "Add zero state in output switcher" into rvc-dev 2020-03-30 02:54:33 +00:00
Julia Reynolds
275f372a72 Merge "Fix broken test" into rvc-dev am: 5a950b763f
Change-Id: If25879aec1e877bb64b1f3e2c831c677f3b80dc9
2020-03-27 15:59:02 +00:00
Julia Reynolds
5a950b763f Merge "Fix broken test" into rvc-dev 2020-03-27 15:40:47 +00:00
TreeHugger Robot
98d770345d Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56
Change-Id: I3e02884ec575cd33d4541a41a99403d79e79735b
2020-03-27 15:03:51 +00:00
TreeHugger Robot
50aeb48c56 Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev 2020-03-27 14:43:57 +00:00
TreeHugger Robot
ca9dad3430 Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406
Change-Id: I6259f15e62ecb2bd18e9430ae79ce7f6f455945d
2020-03-27 14:11:07 +00:00
TreeHugger Robot
5f886e7406 Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev 2020-03-27 13:53:22 +00:00
Julia Reynolds
83d0de8d07 Fix broken test
Test: this
Fixes: 152374833
Change-Id: I9065f6b3700fa288cb3fd65ef2b24c2821325e51
2020-03-27 09:36:18 -04:00
TreeHugger Robot
857392d25b Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f
Change-Id: I17c24d2ab1c3344e985f0dd8427bd74b1a3d50db
2020-03-27 13:12:13 +00:00
TreeHugger Robot
493bf6697f Merge "Add mocked main looper to test" into rvc-dev 2020-03-27 13:00:21 +00:00
Alic Tsai
019c186bb7 Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69
Change-Id: Ie74fcd532cb8ea4ed362b03f8c3b4dc54d73225c
2020-03-27 12:35:19 +00:00