PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO Disclosures: Combine personal and work CA cert

Browse Source 
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
This commit is contained in:
Bartosz Fabianowski
2017-03-21 13:57:27 +01:00
parent 479f32e0ed
commit 4a19625286
11 changed files with 66 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -8243,10 +8243,8 @@
<string name="enterprise_privacy_always_on_vpn_work">Always-on VPN turned on in your work profile</string> <string name="enterprise_privacy_always_on_vpn_work">Always-on VPN turned on in your work profile</string>
<!-- Label explaining that a global HTTP proxy was set by the admin. [CHAR LIMIT=NONE] --> <!-- Label explaining that a global HTTP proxy was set by the admin. [CHAR LIMIT=NONE] -->
<string name="enterprise_privacy_global_http_proxy">Global HTTP proxy set</string> <string name="enterprise_privacy_global_http_proxy">Global HTTP proxy set</string>
<!-- Label explaining that the admin installed trusted CA certificates for the current user. [CHAR LIMIT=NONE] --> <!-- Label explaining that the admin installed trusted CA certificates. [CHAR LIMIT=NONE] -->
<string name="enterprise_privacy_ca_certs_user">Trusted credentials</string> <string name="enterprise_privacy_ca_certs">Trusted credentials</string>
<!-- Label explaining that the admin installed trusted CA certificates for the personal profile. [CHAR LIMIT=NONE] -->
<string name="enterprise_privacy_ca_certs_personal">Trusted credentials in your personal profile</string>
<!-- Summary indicating the number of trusted CA certificates installed by the admin. [CHAR LIMIT=NONE] --> <!-- Summary indicating the number of trusted CA certificates installed by the admin. [CHAR LIMIT=NONE] -->
<plurals name="enterprise_privacy_number_ca_certs"> <plurals name="enterprise_privacy_number_ca_certs">
<item quantity="one"><xliff:g id="count">%d</xliff:g> CA certificate</item> <item quantity="one"><xliff:g id="count">%d</xliff:g> CA certificate</item>
@@ -8257,8 +8255,6 @@
<item quantity="one"><xliff:g id="count">%d</xliff:g> CA certificate. Tap to view.</item> <item quantity="one"><xliff:g id="count">%d</xliff:g> CA certificate. Tap to view.</item>
<item quantity="other"><xliff:g id="count">%d</xliff:g> CA certificates. Tap to view.</item> <item quantity="other"><xliff:g id="count">%d</xliff:g> CA certificates. Tap to view.</item>
</plurals> </plurals>
<!-- Label explaining that the admin installed trusted CA certificates for the work profile. [CHAR LIMIT=NONE] -->
<string name="enterprise_privacy_ca_certs_work">Trusted credentials in your work profile</string>
<!-- Label explaining that the admin can lock the device and change the user's password. [CHAR LIMIT=NONE] --> <!-- Label explaining that the admin can lock the device and change the user's password. [CHAR LIMIT=NONE] -->
<string name="enterprise_privacy_lock_device">Admin can lock the device and reset password</string> <string name="enterprise_privacy_lock_device">Admin can lock the device and reset password</string>
<!-- Label explaining that the admin can wipe the device remotely. [CHAR LIMIT=NONE] --> <!-- Label explaining that the admin can wipe the device remotely. [CHAR LIMIT=NONE] -->

7
res/xml/enterprise_privacy_settings.xml
View File

@@ -90,11 +90,8 @@
android:title="@string/enterprise_privacy_global_http_proxy" android:title="@string/enterprise_privacy_global_http_proxy"
settings:multiLine="true"/> settings:multiLine="true"/>
<com.android.settings.DividerPreference <com.android.settings.DividerPreference
android:key="ca_certs_current_user" android:key="ca_certs"
settings:multiLine="true"/> android:title="@string/enterprise_privacy_ca_certs"
<com.android.settings.DividerPreference
android:key="ca_certs_managed_profile"
android:title="@string/enterprise_privacy_ca_certs_work"
settings:multiLine="true"/> settings:multiLine="true"/>
</PreferenceCategory> </PreferenceCategory>

60
src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
View File

@@ -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;
}
}

11
src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java → src/com/android/settings/enterprise/CaCertsPreferenceController.java
View File

@@ -22,12 +22,12 @@ import com.android.settings.R;
import com.android.settings.core.PreferenceController; import com.android.settings.core.PreferenceController;
import com.android.settings.overlay.FeatureFactory; 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; private final EnterprisePrivacyFeatureProvider mFeatureProvider;
public CaCertsManagedProfilePreferenceController(Context context) { public CaCertsPreferenceController(Context context) {
super(context); super(context);
mFeatureProvider = FeatureFactory.getFactory(context) mFeatureProvider = FeatureFactory.getFactory(context)
.getEnterprisePrivacyFeatureProvider(context); .getEnterprisePrivacyFeatureProvider(context);
@@ -35,7 +35,8 @@ public class CaCertsManagedProfilePreferenceController extends PreferenceControl
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
final int certs = mFeatureProvider.getNumberOfOwnerInstalledCaCertsInManagedProfile(); final int certs =
mFeatureProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile();
if (certs == 0) { if (certs == 0) {
preference.setVisible(false); preference.setVisible(false);
return; return;
@@ -52,6 +53,6 @@ public class CaCertsManagedProfilePreferenceController extends PreferenceControl
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return KEY_CA_CERTS_MANAGED_PROFILE; return CA_CERTS;
} }
} }

10
src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
View File

@@ -98,15 +98,9 @@ public interface EnterprisePrivacyFeatureProvider {
/** /**
* Returns the number of CA certificates that the Device Owner or Profile Owner installed in * 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(); int getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile();
/**
* Returns the number of CA certificates that the Profile Owner installed in the current user's
* managed profile (if any).
*/
int getNumberOfOwnerInstalledCaCertsInManagedProfile();
/** /**
* Returns the number of Device Admin apps active in the current user and the user's managed * Returns the number of Device Admin apps active in the current user and the user's managed

21
src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
View File

@@ -189,19 +189,20 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
} }
@Override @Override
public int getNumberOfOwnerInstalledCaCertsInCurrentUser() { public int getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile() {
final List<String> certs = mDpm.getOwnerInstalledCaCerts(new UserHandle(MY_USER_ID)); int num = 0;
return certs != null ? certs.size() : 0; List<String> certs = mDpm.getOwnerInstalledCaCerts(new UserHandle(MY_USER_ID));
if (certs != null) {
num += certs.size();
} }
@Override
public int getNumberOfOwnerInstalledCaCertsInManagedProfile() {
final int userId = getManagedProfileUserId(); final int userId = getManagedProfileUserId();
if (userId == UserHandle.USER_NULL) { if (userId != UserHandle.USER_NULL) {
return 0; certs = mDpm.getOwnerInstalledCaCerts(new UserHandle(userId));
if (certs != null) {
num += certs.size();
} }
final List<String> certs = mDpm.getOwnerInstalledCaCerts(new UserHandle(userId)); }
return certs != null ? certs.size() : 0; return num;
} }
@Override @Override

3
src/com/android/settings/enterprise/EnterprisePrivacySettings.java
View File

@@ -71,8 +71,7 @@ public class EnterprisePrivacySettings extends DashboardFragment {
controllers.add(new AlwaysOnVpnPrimaryUserPreferenceController(context)); controllers.add(new AlwaysOnVpnPrimaryUserPreferenceController(context));
controllers.add(new AlwaysOnVpnManagedProfilePreferenceController(context)); controllers.add(new AlwaysOnVpnManagedProfilePreferenceController(context));
controllers.add(new GlobalHttpProxyPreferenceController(context)); controllers.add(new GlobalHttpProxyPreferenceController(context));
controllers.add(new CaCertsCurrentUserPreferenceController(context)); controllers.add(new CaCertsPreferenceController(context));
controllers.add(new CaCertsManagedProfilePreferenceController(context));
controllers.add(new FailedPasswordWipePrimaryUserPreferenceController(context)); controllers.add(new FailedPasswordWipePrimaryUserPreferenceController(context));
controllers.add(new FailedPasswordWipeManagedProfilePreferenceController(context)); controllers.add(new FailedPasswordWipeManagedProfilePreferenceController(context));
controllers.add(new ImePreferenceController(context)); controllers.add(new ImePreferenceController(context));

139
tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
View File

@@ -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");
}
}

29
tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java → tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
View File

@@ -37,32 +37,27 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
/** /**
* Tests for {@link CaCertsManagedProfilePreferenceController}. * Tests for {@link CaCertsPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class CaCertsManagedProfilePreferenceControllerTest { public final class CaCertsPreferenceControllerTest {
private final String NUMBER_INSTALLED_CERTS_1 = "1 cert";
private final String NUMBER_INSTALLED_CERTS_10 = "10 certs";
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext; private Context mContext;
private FakeFeatureFactory mFeatureFactory; private FakeFeatureFactory mFeatureFactory;
private CaCertsManagedProfilePreferenceController mController; private CaCertsPreferenceController mController;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest(mContext); FakeFeatureFactory.setupForTest(mContext);
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(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, when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_ca_certs,
1, 1)).thenReturn(NUMBER_INSTALLED_CERTS_1); 10, 10)).thenReturn("10 certs");
when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_ca_certs,
10, 10)).thenReturn(NUMBER_INSTALLED_CERTS_10);
} }
@Test @Test
@@ -71,22 +66,16 @@ public final class CaCertsManagedProfilePreferenceControllerTest {
preference.setVisible(true); preference.setVisible(true);
when(mFeatureFactory.enterprisePrivacyFeatureProvider when(mFeatureFactory.enterprisePrivacyFeatureProvider
.getNumberOfOwnerInstalledCaCertsInManagedProfile()).thenReturn(0); .getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()).thenReturn(0);
mController.updateState(preference); mController.updateState(preference);
assertThat(preference.isVisible()).isFalse(); 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); preference.setVisible(false);
when(mFeatureFactory.enterprisePrivacyFeatureProvider when(mFeatureFactory.enterprisePrivacyFeatureProvider
.getNumberOfOwnerInstalledCaCertsInManagedProfile()).thenReturn(10); .getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()).thenReturn(10);
mController.updateState(preference); mController.updateState(preference);
assertThat(preference.isVisible()).isTrue(); assertThat(preference.isVisible()).isTrue();
assertThat(preference.getSummary()).isEqualTo(NUMBER_INSTALLED_CERTS_10); assertThat(preference.getSummary()).isEqualTo("10 certs");
} }
@Test @Test
@@ -102,6 +91,6 @@ public final class CaCertsManagedProfilePreferenceControllerTest {
@Test @Test
public void testGetPreferenceKey() { public void testGetPreferenceKey() {
assertThat(mController.getPreferenceKey()).isEqualTo("ca_certs_managed_profile"); assertThat(mController.getPreferenceKey()).isEqualTo("ca_certs");
} }
} }

48
tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
View File

@@ -268,39 +268,45 @@ public final class EnterprisePrivacyFeatureProviderImplTest {
} }
@Test @Test
public void testGetNumberOfOwnerInstalledCaCertsInCurrentUser() { public void testGetNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile() {
final UserHandle userHandle = new UserHandle(UserHandle.USER_SYSTEM); final UserHandle userHandle = new UserHandle(UserHandle.USER_SYSTEM);
final UserHandle managedProfileUserHandle = new UserHandle(MANAGED_PROFILE_USER_ID);
when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
.thenReturn(null);
assertThat(mProvider.getNumberOfOwnerInstalledCaCertsInCurrentUser()).isEqualTo(0);
when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
.thenReturn(new ArrayList<String>());
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 UserInfo managedProfile = final UserInfo managedProfile =
new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE); 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)) when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
.thenReturn(null); .thenReturn(null);
assertThat(mProvider.getNumberOfOwnerInstalledCaCertsInManagedProfile()).isEqualTo(0); assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile())
.isEqualTo(0);
when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle)) when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
.thenReturn(new ArrayList<String>()); .thenReturn(new ArrayList<String>());
assertThat(mProvider.getNumberOfOwnerInstalledCaCertsInManagedProfile()).isEqualTo(0); assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile())
.isEqualTo(0);
when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle)) when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
.thenReturn(Arrays.asList(new String[] {"ca1", "ca2"})); .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<String>());
assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile())
.isEqualTo(2);
when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
.thenReturn(Arrays.asList(new String[] {"ca1", "ca2"}));
assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile())
.isEqualTo(4);
mProfiles.remove(managedProfile); mProfiles.remove(managedProfile);
assertThat(mProvider.getNumberOfOwnerInstalledCaCertsInManagedProfile()).isEqualTo(0); assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile())
.isEqualTo(2);
} }
@Test @Test

10
tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
View File

@@ -117,7 +117,7 @@ public final class EnterprisePrivacySettingsTest {
private void verifyPreferenceControllers(List<PreferenceController> controllers) { private void verifyPreferenceControllers(List<PreferenceController> controllers) {
assertThat(controllers).isNotNull(); assertThat(controllers).isNotNull();
assertThat(controllers.size()).isEqualTo(17); assertThat(controllers.size()).isEqualTo(16);
assertThat(controllers.get(0)).isInstanceOf(InstalledPackagesPreferenceController.class); assertThat(controllers.get(0)).isInstanceOf(InstalledPackagesPreferenceController.class);
assertThat(controllers.get(1)).isInstanceOf(NetworkLogsPreferenceController.class); assertThat(controllers.get(1)).isInstanceOf(NetworkLogsPreferenceController.class);
assertThat(controllers.get(2)).isInstanceOf(BugReportsPreferenceController.class); assertThat(controllers.get(2)).isInstanceOf(BugReportsPreferenceController.class);
@@ -137,13 +137,11 @@ public final class EnterprisePrivacySettingsTest {
assertThat(controllers.get(10)).isInstanceOf( assertThat(controllers.get(10)).isInstanceOf(
AlwaysOnVpnManagedProfilePreferenceController.class); AlwaysOnVpnManagedProfilePreferenceController.class);
assertThat(controllers.get(11)).isInstanceOf(GlobalHttpProxyPreferenceController.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( assertThat(controllers.get(13)).isInstanceOf(
CaCertsManagedProfilePreferenceController.class);
assertThat(controllers.get(14)).isInstanceOf(
FailedPasswordWipePrimaryUserPreferenceController.class); FailedPasswordWipePrimaryUserPreferenceController.class);
assertThat(controllers.get(15)).isInstanceOf( assertThat(controllers.get(14)).isInstanceOf(
FailedPasswordWipeManagedProfilePreferenceController.class); FailedPasswordWipeManagedProfilePreferenceController.class);
assertThat(controllers.get(16)).isInstanceOf(ImePreferenceController.class); assertThat(controllers.get(15)).isInstanceOf(ImePreferenceController.class);
} }
} }