From 4a196252862d5d5e23e73afc411fc6789af92712 Mon Sep 17 00:00:00 2001 From: Bartosz Fabianowski Date: Tue, 21 Mar 2017 13:57:27 +0100 Subject: [PATCH] DO Disclosures: Combine personal and work CA cert It was decided that rather than having two separate items for CA certs in the personal and work spaces, we should have just one item that lists the sum of installed certs. Bug: 32692748 Test: m RunSettingsRoboTests Change-Id: Ic8a3db214a07992e3970262c2ce91f3df8a87773 --- res/values/strings.xml | 8 +- res/xml/enterprise_privacy_settings.xml | 7 +- ...aCertsCurrentUserPreferenceController.java | 60 -------- ....java => CaCertsPreferenceController.java} | 11 +- .../EnterprisePrivacyFeatureProvider.java | 10 +- .../EnterprisePrivacyFeatureProviderImpl.java | 25 ++-- .../enterprise/EnterprisePrivacySettings.java | 3 +- ...tsCurrentUserPreferenceControllerTest.java | 139 ------------------ ...a => CaCertsPreferenceControllerTest.java} | 29 ++-- ...erprisePrivacyFeatureProviderImplTest.java | 48 +++--- .../EnterprisePrivacySettingsTest.java | 10 +- 11 files changed, 66 insertions(+), 284 deletions(-) delete mode 100644 src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java rename src/com/android/settings/enterprise/{CaCertsManagedProfilePreferenceController.java => CaCertsPreferenceController.java} (80%) delete mode 100644 tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java rename tests/robotests/src/com/android/settings/enterprise/{CaCertsManagedProfilePreferenceControllerTest.java => CaCertsPreferenceControllerTest.java} (69%) diff --git a/res/values/strings.xml b/res/values/strings.xml index 7ed24642ac6..e9101cb42a1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8243,10 +8243,8 @@ Always-on VPN turned on in your work profile Global HTTP proxy set - - Trusted credentials - - Trusted credentials in your personal profile + + Trusted credentials %d CA certificate @@ -8257,8 +8255,6 @@ %d CA certificate. Tap to view. %d CA certificates. Tap to view. - - Trusted credentials in your work profile Admin can lock the device and reset password diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml index 1a08cda2c8a..e6246c2c43b 100644 --- a/res/xml/enterprise_privacy_settings.xml +++ b/res/xml/enterprise_privacy_settings.xml @@ -90,11 +90,8 @@ android:title="@string/enterprise_privacy_global_http_proxy" settings:multiLine="true"/> - diff --git a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java deleted file mode 100644 index 1895e09f234..00000000000 --- a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package com.android.settings.enterprise; - -import android.content.Context; -import android.content.res.Resources; -import android.support.v7.preference.Preference; - -import com.android.settings.R; -import com.android.settings.core.PreferenceController; -import com.android.settings.overlay.FeatureFactory; - -public class CaCertsCurrentUserPreferenceController extends PreferenceController { - - private static final String CA_CERTS_CURRENT_USER = "ca_certs_current_user"; - private final EnterprisePrivacyFeatureProvider mFeatureProvider; - - public CaCertsCurrentUserPreferenceController(Context context) { - super(context); - mFeatureProvider = FeatureFactory.getFactory(context) - .getEnterprisePrivacyFeatureProvider(context); - } - - @Override - public void updateState(Preference preference) { - final int certs = mFeatureProvider.getNumberOfOwnerInstalledCaCertsInCurrentUser(); - if (certs == 0) { - preference.setVisible(false); - return; - } - preference.setTitle(mFeatureProvider.isInCompMode() - ? R.string.enterprise_privacy_ca_certs_personal - : R.string.enterprise_privacy_ca_certs_user); - preference.setSummary(mContext.getResources().getQuantityString( - R.plurals.enterprise_privacy_number_ca_certs, certs, certs)); - preference.setVisible(true); - } - - @Override - public boolean isAvailable() { - return true; - } - - @Override - public String getPreferenceKey() { - return CA_CERTS_CURRENT_USER; - } -} diff --git a/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/CaCertsPreferenceController.java similarity index 80% rename from src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java rename to src/com/android/settings/enterprise/CaCertsPreferenceController.java index cc0d4f68b06..d18eff0dc7c 100644 --- a/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java +++ b/src/com/android/settings/enterprise/CaCertsPreferenceController.java @@ -22,12 +22,12 @@ import com.android.settings.R; import com.android.settings.core.PreferenceController; import com.android.settings.overlay.FeatureFactory; -public class CaCertsManagedProfilePreferenceController extends PreferenceController { +public class CaCertsPreferenceController extends PreferenceController { - private static final String KEY_CA_CERTS_MANAGED_PROFILE = "ca_certs_managed_profile"; + private static final String CA_CERTS = "ca_certs"; private final EnterprisePrivacyFeatureProvider mFeatureProvider; - public CaCertsManagedProfilePreferenceController(Context context) { + public CaCertsPreferenceController(Context context) { super(context); mFeatureProvider = FeatureFactory.getFactory(context) .getEnterprisePrivacyFeatureProvider(context); @@ -35,7 +35,8 @@ public class CaCertsManagedProfilePreferenceController extends PreferenceControl @Override public void updateState(Preference preference) { - final int certs = mFeatureProvider.getNumberOfOwnerInstalledCaCertsInManagedProfile(); + final int certs = + mFeatureProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile(); if (certs == 0) { preference.setVisible(false); return; @@ -52,6 +53,6 @@ public class CaCertsManagedProfilePreferenceController extends PreferenceControl @Override public String getPreferenceKey() { - return KEY_CA_CERTS_MANAGED_PROFILE; + return CA_CERTS; } } diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java index 2270efac8d5..447886595ac 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java @@ -98,15 +98,9 @@ public interface EnterprisePrivacyFeatureProvider { /** * Returns the number of CA certificates that the Device Owner or Profile Owner installed in - * the current user. + * the current user and the user's managed profile (if any). */ - int getNumberOfOwnerInstalledCaCertsInCurrentUser(); - - /** - * Returns the number of CA certificates that the Profile Owner installed in the current user's - * managed profile (if any). - */ - int getNumberOfOwnerInstalledCaCertsInManagedProfile(); + int getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile(); /** * Returns the number of Device Admin apps active in the current user and the user's managed diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java index 6cff807de91..69eaa2e40ab 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java @@ -189,19 +189,20 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe } @Override - public int getNumberOfOwnerInstalledCaCertsInCurrentUser() { - final List certs = mDpm.getOwnerInstalledCaCerts(new UserHandle(MY_USER_ID)); - return certs != null ? certs.size() : 0; - } - - @Override - public int getNumberOfOwnerInstalledCaCertsInManagedProfile() { - final int userId = getManagedProfileUserId(); - if (userId == UserHandle.USER_NULL) { - return 0; + public int getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile() { + int num = 0; + List certs = mDpm.getOwnerInstalledCaCerts(new UserHandle(MY_USER_ID)); + if (certs != null) { + num += certs.size(); } - final List certs = mDpm.getOwnerInstalledCaCerts(new UserHandle(userId)); - return certs != null ? certs.size() : 0; + final int userId = getManagedProfileUserId(); + if (userId != UserHandle.USER_NULL) { + certs = mDpm.getOwnerInstalledCaCerts(new UserHandle(userId)); + if (certs != null) { + num += certs.size(); + } + } + return num; } @Override diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java index 0fb341a4993..50f54548ec8 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java @@ -71,8 +71,7 @@ public class EnterprisePrivacySettings extends DashboardFragment { controllers.add(new AlwaysOnVpnPrimaryUserPreferenceController(context)); controllers.add(new AlwaysOnVpnManagedProfilePreferenceController(context)); controllers.add(new GlobalHttpProxyPreferenceController(context)); - controllers.add(new CaCertsCurrentUserPreferenceController(context)); - controllers.add(new CaCertsManagedProfilePreferenceController(context)); + controllers.add(new CaCertsPreferenceController(context)); controllers.add(new FailedPasswordWipePrimaryUserPreferenceController(context)); controllers.add(new FailedPasswordWipeManagedProfilePreferenceController(context)); controllers.add(new ImePreferenceController(context)); diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java deleted file mode 100644 index c8ffa7efce0..00000000000 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.enterprise; - -import android.content.Context; -import android.content.res.Resources; -import com.android.settings.R; -import android.support.v7.preference.Preference; - -import com.android.settings.SettingsRobolectricTestRunner; -import com.android.settings.TestConfig; -import com.android.settings.testutils.FakeFeatureFactory; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Answers; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; - -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.when; - -/** - * Tests for {@link CaCertsCurrentUserPreferenceController}. - */ -@RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) -public final class CaCertsCurrentUserPreferenceControllerTest { - - private final String INSTALLED_CERTS_USER = "trusted credentials"; - private final String INSTALLED_CERTS_PERSONAL = "trusted credentials in personal profile"; - private final String NUMBER_INSTALLED_CERTS_1 = "1 cert"; - private final String NUMBER_INSTALLED_CERTS_10 = "10 certs"; - - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private Context mContext; - private FakeFeatureFactory mFeatureFactory; - - private CaCertsCurrentUserPreferenceController mController; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - FakeFeatureFactory.setupForTest(mContext); - mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext); - mController = new CaCertsCurrentUserPreferenceController(mContext); - - when(mContext.getString(R.string.enterprise_privacy_ca_certs_user)) - .thenReturn(INSTALLED_CERTS_USER); - when(mContext.getString(R.string.enterprise_privacy_ca_certs_personal)) - .thenReturn(INSTALLED_CERTS_PERSONAL); - when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_ca_certs, - 1, 1)).thenReturn(NUMBER_INSTALLED_CERTS_1); - when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_ca_certs, - 10, 10)).thenReturn(NUMBER_INSTALLED_CERTS_10); - } - - @Test - public void testUpdateState() { - final Preference preference = new Preference(mContext, null, 0, 0); - preference.setVisible(true); - - when(mFeatureFactory.enterprisePrivacyFeatureProvider.isInCompMode()).thenReturn(false); - - when(mFeatureFactory.enterprisePrivacyFeatureProvider - .getNumberOfOwnerInstalledCaCertsInCurrentUser()).thenReturn(0); - mController.updateState(preference); - assertThat(preference.isVisible()).isFalse(); - - when(mFeatureFactory.enterprisePrivacyFeatureProvider - .getNumberOfOwnerInstalledCaCertsInCurrentUser()).thenReturn(1); - mController.updateState(preference); - assertThat(preference.isVisible()).isTrue(); - assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_USER); - assertThat(preference.getSummary()).isEqualTo(NUMBER_INSTALLED_CERTS_1); - - preference.setVisible(false); - when(mFeatureFactory.enterprisePrivacyFeatureProvider - .getNumberOfOwnerInstalledCaCertsInCurrentUser()).thenReturn(10); - mController.updateState(preference); - assertThat(preference.isVisible()).isTrue(); - assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_USER); - assertThat(preference.getSummary()).isEqualTo(NUMBER_INSTALLED_CERTS_10); - - when(mFeatureFactory.enterprisePrivacyFeatureProvider.isInCompMode()).thenReturn(true); - - when(mFeatureFactory.enterprisePrivacyFeatureProvider - .getNumberOfOwnerInstalledCaCertsInCurrentUser()).thenReturn(0); - mController.updateState(preference); - assertThat(preference.isVisible()).isFalse(); - - when(mFeatureFactory.enterprisePrivacyFeatureProvider - .getNumberOfOwnerInstalledCaCertsInCurrentUser()).thenReturn(1); - mController.updateState(preference); - assertThat(preference.isVisible()).isTrue(); - assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_PERSONAL); - assertThat(preference.getSummary()).isEqualTo(NUMBER_INSTALLED_CERTS_1); - - preference.setVisible(false); - when(mFeatureFactory.enterprisePrivacyFeatureProvider - .getNumberOfOwnerInstalledCaCertsInCurrentUser()).thenReturn(10); - mController.updateState(preference); - assertThat(preference.isVisible()).isTrue(); - assertThat(preference.getTitle()).isEqualTo(INSTALLED_CERTS_PERSONAL); - assertThat(preference.getSummary()).isEqualTo(NUMBER_INSTALLED_CERTS_10); - } - - @Test - public void testIsAvailable() { - assertThat(mController.isAvailable()).isTrue(); - } - - @Test - public void testHandlePreferenceTreeClick() { - assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0))) - .isFalse(); - } - - @Test - public void testGetPreferenceKey() { - assertThat(mController.getPreferenceKey()).isEqualTo("ca_certs_current_user"); - } -} diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java similarity index 69% rename from tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java rename to tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java index 693cfaea699..1d0e1498cba 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java @@ -37,32 +37,27 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; /** - * Tests for {@link CaCertsManagedProfilePreferenceController}. + * Tests for {@link CaCertsPreferenceController}. */ @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) -public final class CaCertsManagedProfilePreferenceControllerTest { - - private final String NUMBER_INSTALLED_CERTS_1 = "1 cert"; - private final String NUMBER_INSTALLED_CERTS_10 = "10 certs"; +public final class CaCertsPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Context mContext; private FakeFeatureFactory mFeatureFactory; - private CaCertsManagedProfilePreferenceController mController; + private CaCertsPreferenceController mController; @Before public void setUp() { MockitoAnnotations.initMocks(this); FakeFeatureFactory.setupForTest(mContext); mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext); - mController = new CaCertsManagedProfilePreferenceController(mContext); + mController = new CaCertsPreferenceController(mContext); when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_ca_certs, - 1, 1)).thenReturn(NUMBER_INSTALLED_CERTS_1); - when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_ca_certs, - 10, 10)).thenReturn(NUMBER_INSTALLED_CERTS_10); + 10, 10)).thenReturn("10 certs"); } @Test @@ -71,22 +66,16 @@ public final class CaCertsManagedProfilePreferenceControllerTest { preference.setVisible(true); when(mFeatureFactory.enterprisePrivacyFeatureProvider - .getNumberOfOwnerInstalledCaCertsInManagedProfile()).thenReturn(0); + .getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()).thenReturn(0); mController.updateState(preference); assertThat(preference.isVisible()).isFalse(); - when(mFeatureFactory.enterprisePrivacyFeatureProvider - .getNumberOfOwnerInstalledCaCertsInManagedProfile()).thenReturn(1); - mController.updateState(preference); - assertThat(preference.isVisible()).isTrue(); - assertThat(preference.getSummary()).isEqualTo(NUMBER_INSTALLED_CERTS_1); - preference.setVisible(false); when(mFeatureFactory.enterprisePrivacyFeatureProvider - .getNumberOfOwnerInstalledCaCertsInManagedProfile()).thenReturn(10); + .getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()).thenReturn(10); mController.updateState(preference); assertThat(preference.isVisible()).isTrue(); - assertThat(preference.getSummary()).isEqualTo(NUMBER_INSTALLED_CERTS_10); + assertThat(preference.getSummary()).isEqualTo("10 certs"); } @Test @@ -102,6 +91,6 @@ public final class CaCertsManagedProfilePreferenceControllerTest { @Test public void testGetPreferenceKey() { - assertThat(mController.getPreferenceKey()).isEqualTo("ca_certs_managed_profile"); + assertThat(mController.getPreferenceKey()).isEqualTo("ca_certs"); } } diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java index d4eec19f7bc..2afcab9b448 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java @@ -268,39 +268,45 @@ public final class EnterprisePrivacyFeatureProviderImplTest { } @Test - public void testGetNumberOfOwnerInstalledCaCertsInCurrentUser() { + public void testGetNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile() { final UserHandle userHandle = new UserHandle(UserHandle.USER_SYSTEM); - - when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle)) - .thenReturn(null); - assertThat(mProvider.getNumberOfOwnerInstalledCaCertsInCurrentUser()).isEqualTo(0); - when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle)) - .thenReturn(new ArrayList()); - assertThat(mProvider.getNumberOfOwnerInstalledCaCertsInCurrentUser()).isEqualTo(0); - when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle)) - .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"})); - assertThat(mProvider.getNumberOfOwnerInstalledCaCertsInCurrentUser()).isEqualTo(2); - } - - @Test - public void testGetNumberOfOwnerInstalledCaCertsInManagedProfile() { - final UserHandle userHandle = new UserHandle(MANAGED_PROFILE_USER_ID); + final UserHandle managedProfileUserHandle = new UserHandle(MANAGED_PROFILE_USER_ID); final UserInfo managedProfile = new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE); - mProfiles.add(managedProfile); + when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle)) + .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"})); + when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle)) .thenReturn(null); - assertThat(mProvider.getNumberOfOwnerInstalledCaCertsInManagedProfile()).isEqualTo(0); + assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()) + .isEqualTo(0); when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle)) .thenReturn(new ArrayList()); - assertThat(mProvider.getNumberOfOwnerInstalledCaCertsInManagedProfile()).isEqualTo(0); + assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()) + .isEqualTo(0); when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle)) .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"})); - assertThat(mProvider.getNumberOfOwnerInstalledCaCertsInManagedProfile()).isEqualTo(2); + assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()) + .isEqualTo(2); + + mProfiles.add(managedProfile); + when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle)) + .thenReturn(null); + assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()) + .isEqualTo(2); + when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle)) + .thenReturn(new ArrayList()); + assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()) + .isEqualTo(2); + when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle)) + .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"})); + assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()) + .isEqualTo(4); mProfiles.remove(managedProfile); - assertThat(mProvider.getNumberOfOwnerInstalledCaCertsInManagedProfile()).isEqualTo(0); + assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()) + .isEqualTo(2); } @Test diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java index 46d6b6c6e6b..8a117794d34 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java @@ -117,7 +117,7 @@ public final class EnterprisePrivacySettingsTest { private void verifyPreferenceControllers(List controllers) { assertThat(controllers).isNotNull(); - assertThat(controllers.size()).isEqualTo(17); + assertThat(controllers.size()).isEqualTo(16); assertThat(controllers.get(0)).isInstanceOf(InstalledPackagesPreferenceController.class); assertThat(controllers.get(1)).isInstanceOf(NetworkLogsPreferenceController.class); assertThat(controllers.get(2)).isInstanceOf(BugReportsPreferenceController.class); @@ -137,13 +137,11 @@ public final class EnterprisePrivacySettingsTest { assertThat(controllers.get(10)).isInstanceOf( AlwaysOnVpnManagedProfilePreferenceController.class); assertThat(controllers.get(11)).isInstanceOf(GlobalHttpProxyPreferenceController.class); - assertThat(controllers.get(12)).isInstanceOf(CaCertsCurrentUserPreferenceController.class); + assertThat(controllers.get(12)).isInstanceOf(CaCertsPreferenceController.class); assertThat(controllers.get(13)).isInstanceOf( - CaCertsManagedProfilePreferenceController.class); - assertThat(controllers.get(14)).isInstanceOf( FailedPasswordWipePrimaryUserPreferenceController.class); - assertThat(controllers.get(15)).isInstanceOf( + assertThat(controllers.get(14)).isInstanceOf( FailedPasswordWipeManagedProfilePreferenceController.class); - assertThat(controllers.get(16)).isInstanceOf(ImePreferenceController.class); + assertThat(controllers.get(15)).isInstanceOf(ImePreferenceController.class); } }