diff --git a/res/values/strings.xml b/res/values/strings.xml index 3c9a4cca1dc..01ebb12be40 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7983,20 +7983,28 @@ To provide access to your work data, your organization may change settings and install software on your device, which could cause some of your personal content to be visible to your admin. Contact your organization\'s admin for more details. - What types of information can your organization see? + What types of information can your organization see? - What changes affect what your organization can see? + What changes affect what your organization can see? - What actions may impact your access to this device? + What actions may impact your access to this device? - Data associated with your work account, such as email and calendar + Data associated with your work account, such as email and calendar - List of all apps on your device + List of all apps on your device - + List of all %d app on your device List of all %d apps on your device - Usage (time spent and amount of data used) of each app on your device + Usage (time spent and amount of data used) of each app on your device + + Traffic logs on your device + + Your most recent bug report + + Your most recent security log + + Never diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml index 1dbb66c0eec..e1761e22583 100644 --- a/res/xml/enterprise_privacy_settings.xml +++ b/res/xml/enterprise_privacy_settings.xml @@ -24,28 +24,43 @@ android:summary="@string/enterprise_privacy_header" android:selectable="false"/> - + + + + - + - + diff --git a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java new file mode 100644 index 00000000000..67b1d13e429 --- /dev/null +++ b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2016 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.support.v7.preference.Preference; +import android.text.format.DateUtils; + +import com.android.settings.R; +import com.android.settings.core.PreferenceController; +import com.android.settings.overlay.FeatureFactory; + +import java.util.Date; + +public abstract class AdminActionPreferenceControllerBase extends PreferenceController { + + private final Context mContext; + protected final EnterprisePrivacyFeatureProvider mFeatureProvider; + + public AdminActionPreferenceControllerBase(Context context) { + super(context); + mContext = context; + mFeatureProvider = FeatureFactory.getFactory(context) + .getEnterprisePrivacyFeatureProvider(context); + } + + protected abstract Date getAdminActionTimestamp(); + + @Override + public void updateState(Preference preference) { + final Date timestamp = getAdminActionTimestamp(); + preference.setSummary(timestamp == null ? + mContext.getString(R.string.enterprise_privacy_never) : + DateUtils.formatDateTime(mContext, timestamp.getTime(), + DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE)); + } + + @Override + public boolean isAvailable() { + return true; + } + + @Override + public boolean handlePreferenceTreeClick(Preference preference) { + return false; + } +} diff --git a/src/com/android/settings/enterprise/BugReportsPreferenceController.java b/src/com/android/settings/enterprise/BugReportsPreferenceController.java new file mode 100644 index 00000000000..b5b61c303e1 --- /dev/null +++ b/src/com/android/settings/enterprise/BugReportsPreferenceController.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2016 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 java.util.Date; + +public class BugReportsPreferenceController extends AdminActionPreferenceControllerBase { + + private static final String KEY_BUG_REPORTS = "bug_reports"; + + public BugReportsPreferenceController(Context context) { + super(context); + } + + @Override + protected Date getAdminActionTimestamp() { + return mFeatureProvider.getLastBugReportRequestTime(); + } + + @Override + public String getPreferenceKey() { + return KEY_BUG_REPORTS; + } +} diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java index 2d8ca1f250f..d65292f56d2 100644 --- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java +++ b/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java @@ -31,4 +31,25 @@ public interface DevicePolicyManagerWrapper { * @see android.app.admin.DevicePolicyManager#getDeviceOwnerComponentOnAnyUser */ ComponentName getDeviceOwnerComponentOnAnyUser(); + + /** + * Calls {@code DevicePolicyManager.getLastSecurityLogRetrievalTime()}. + * + * @see android.app.admin.DevicePolicyManager#getLastSecurityLogRetrievalTime + */ + public long getLastSecurityLogRetrievalTime(); + + /** + * Calls {@code DevicePolicyManager.getLastBugReportRequestTime()}. + * + * @see android.app.admin.DevicePolicyManager#getLastBugReportRequestTime + */ + public long getLastBugReportRequestTime(); + + /** + * Calls {@code DevicePolicyManager.getLastNetworkLogRetrievalTime()}. + * + * @see android.app.admin.DevicePolicyManager#getLastNetworkLogRetrievalTime + */ + public long getLastNetworkLogRetrievalTime(); } diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java index 2b1efb44775..710e5ace31a 100644 --- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java +++ b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java @@ -30,4 +30,19 @@ public class DevicePolicyManagerWrapperImpl implements DevicePolicyManagerWrappe public ComponentName getDeviceOwnerComponentOnAnyUser() { return mDpm.getDeviceOwnerComponentOnAnyUser(); } + + @Override + public long getLastSecurityLogRetrievalTime() { + return mDpm.getLastSecurityLogRetrievalTime(); + } + + @Override + public long getLastBugReportRequestTime() { + return mDpm.getLastBugReportRequestTime(); + } + + @Override + public long getLastNetworkLogRetrievalTime() { + return mDpm.getLastNetworkLogRetrievalTime(); + } } diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java index e2fb0a3bc33..efc02d624c0 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java @@ -16,6 +16,30 @@ package com.android.settings.enterprise; +import java.util.Date; + public interface EnterprisePrivacyFeatureProvider { + + /** + * Returns whether the device is managed by a Device Owner app. + */ boolean hasDeviceOwner(); + + /** + * Returns the time at which the Device Owner last retrieved security logs, or {@code null} if + * logs were never retrieved by the Device Owner on this device. + */ + Date getLastSecurityLogRetrievalTime(); + + /** + * Returns the time at which the Device Owner last requested a bug report, or {@code null} if no + * bug report was ever requested by the Device Owner on this device. + */ + Date getLastBugReportRequestTime(); + + /** + * Returns the time at which the Device Owner last retrieved network logs, or {@code null} if + * logs were never retrieved by the Device Owner on this device. + */ + Date getLastNetworkLogRetrievalTime(); } diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java index 8cdf27048d2..2e8b7f6a203 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java @@ -20,6 +20,8 @@ import android.content.pm.PackageManager; import com.android.settings.applications.PackageManagerWrapper; +import java.util.Date; + public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFeatureProvider { private final DevicePolicyManagerWrapper mDpm; @@ -38,4 +40,20 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe } return mDpm.getDeviceOwnerComponentOnAnyUser() != null; } + + @Override + public Date getLastSecurityLogRetrievalTime() { + final long timestamp = mDpm.getLastSecurityLogRetrievalTime(); + return timestamp < 0 ? null : new Date(timestamp); + } + + public Date getLastBugReportRequestTime() { + final long timestamp = mDpm.getLastBugReportRequestTime(); + return timestamp < 0 ? null : new Date(timestamp); + } + + public Date getLastNetworkLogRetrievalTime() { + final long timestamp = mDpm.getLastNetworkLogRetrievalTime(); + return timestamp < 0 ? null : new Date(timestamp); + } } diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java index 9ac76df4489..91d3a651e35 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java @@ -58,6 +58,9 @@ public class EnterprisePrivacySettings extends DashboardFragment { protected List getPreferenceControllers(Context context) { final List controllers = new ArrayList(); controllers.add(new InstalledPackagesPreferenceController(context)); + controllers.add(new NetworkLogsPreferenceController(context)); + controllers.add(new BugReportsPreferenceController(context)); + controllers.add(new SecurityLogsPreferenceController(context)); return controllers; } diff --git a/src/com/android/settings/enterprise/InstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/InstalledPackagesPreferenceController.java index 34c72ed2db1..df1c6c4659c 100644 --- a/src/com/android/settings/enterprise/InstalledPackagesPreferenceController.java +++ b/src/com/android/settings/enterprise/InstalledPackagesPreferenceController.java @@ -40,7 +40,7 @@ public class InstalledPackagesPreferenceController extends PreferenceController @Override public void onNumberOfInstalledAppsResult(int num) { preference.setTitle(mContext.getResources().getQuantityString( - R.plurals.number_installed_packages, num, num)); + R.plurals.enterprise_privacy_number_installed_packages, num, num)); } }); } diff --git a/src/com/android/settings/enterprise/NetworkLogsPreferenceController.java b/src/com/android/settings/enterprise/NetworkLogsPreferenceController.java new file mode 100644 index 00000000000..d7da5256675 --- /dev/null +++ b/src/com/android/settings/enterprise/NetworkLogsPreferenceController.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2016 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 java.util.Date; + +public class NetworkLogsPreferenceController extends AdminActionPreferenceControllerBase { + + private static final String KEY_NETWORK_LOGS = "network_logs"; + + public NetworkLogsPreferenceController(Context context) { + super(context); + } + + @Override + protected Date getAdminActionTimestamp() { + return mFeatureProvider.getLastNetworkLogRetrievalTime(); + } + + @Override + public String getPreferenceKey() { + return KEY_NETWORK_LOGS; + } +} diff --git a/src/com/android/settings/enterprise/SecurityLogsPreferenceController.java b/src/com/android/settings/enterprise/SecurityLogsPreferenceController.java new file mode 100644 index 00000000000..60baa6331c2 --- /dev/null +++ b/src/com/android/settings/enterprise/SecurityLogsPreferenceController.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2016 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 java.util.Date; + +public class SecurityLogsPreferenceController extends AdminActionPreferenceControllerBase { + + private static final String KEY_SECURITY_LOGS = "security_logs"; + + public SecurityLogsPreferenceController(Context context) { + super(context); + } + + @Override + protected Date getAdminActionTimestamp() { + return mFeatureProvider.getLastSecurityLogRetrievalTime(); + } + + @Override + public String getPreferenceKey() { + return KEY_SECURITY_LOGS; + } +} diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java new file mode 100644 index 00000000000..66233f52f15 --- /dev/null +++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2016 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 com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.TestConfig; + +import org.junit.runner.RunWith; +import org.robolectric.annotation.Config; + +import java.util.Date; + +/** + * Tests for {@link AdminActionPreferenceControllerBase}. + */ +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public final class AdminActionPreferenceControllerBaseTest extends + AdminActionPreferenceControllerTestBase { + + private Date mDate; + + @Override + public void setUp() { + super.setUp(); + mController = new AdminActionPreferenceControllerBaseTestable(); + } + + @Override + public void setDate(Date date) { + mDate = date; + } + + @Override + public String getPreferenceKey() { + return null; + } + + private class AdminActionPreferenceControllerBaseTestable extends + AdminActionPreferenceControllerBase { + AdminActionPreferenceControllerBaseTestable() { + super(mContext); + } + + @Override + protected Date getAdminActionTimestamp() { + return mDate; + } + + @Override + public String getPreferenceKey() { + return null; + } + } +} diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java new file mode 100644 index 00000000000..c8cb69c05ce --- /dev/null +++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2016 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.provider.Settings; +import android.support.v7.preference.Preference; +import android.text.format.DateUtils; + +import com.android.settings.R; +import com.android.settings.testutils.FakeFeatureFactory; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.Answers; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.Date; +import java.util.GregorianCalendar; + +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.when; + +/** + * Common base for testing subclasses of {@link AdminActionPreferenceControllerBase}. + */ +public abstract class AdminActionPreferenceControllerTestBase { + + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + protected Context mContext; + protected FakeFeatureFactory mFeatureFactory; + + protected AdminActionPreferenceControllerBase mController; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + FakeFeatureFactory.setupForTest(mContext); + mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext); + } + + protected abstract void setDate(Date date); + + @Test + public void testUpdateState() { + final Preference preference = new Preference(mContext, null, 0, 0); + when(mContext.getString(R.string.enterprise_privacy_never)).thenReturn("Never"); + Settings.System.putString(mContext.getContentResolver(), Settings.System.TIME_12_24, "24"); + + setDate(null); + mController.updateState(preference); + assertThat(preference.getSummary()).isEqualTo("Never"); + + final Date date = new GregorianCalendar(2011 /* year */, 10 /* month */, 9 /* dayOfMonth */, + 8 /* hourOfDay */, 7 /* minute */, 6 /* second */).getTime(); + setDate(date); + mController.updateState(preference); + assertThat(preference.getSummary()).isEqualTo(DateUtils.formatDateTime( + mContext, date.getTime(), DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE)); + } + + @Test + public void testIsAvailable() { + assertThat(mController.isAvailable()).isTrue(); + } + + @Test + public void testHandlePreferenceTreeClick() { + assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0))) + .isFalse(); + } + + public abstract String getPreferenceKey(); + + @Test + public void testGetPreferenceKey() { + assertThat(mController.getPreferenceKey()).isEqualTo(getPreferenceKey()); + } +} diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java new file mode 100644 index 00000000000..ae1e264992c --- /dev/null +++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2016 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 com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.TestConfig; +import com.android.settings.testutils.FakeFeatureFactory; + +import org.junit.runner.RunWith; +import org.robolectric.annotation.Config; + +import java.util.Date; + +import static org.mockito.Mockito.when; + +/** + * Tests for {@link BugReportsPreferenceController}. + */ +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public final class BugReportsPreferenceControllerTest extends + AdminActionPreferenceControllerTestBase { + + @Override + public void setUp() { + super.setUp(); + mController = new BugReportsPreferenceController(mContext); + } + + @Override + public void setDate(Date date) { + when(mFeatureFactory.enterprisePrivacyFeatureProvider.getLastBugReportRequestTime()) + .thenReturn(date); + } + + @Override + public String getPreferenceKey() { + return "bug_reports"; + } +} diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java index be43d0ec9e9..9688c125354 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java @@ -23,6 +23,7 @@ import android.content.pm.PackageManager; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +31,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; +import java.util.Date; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; @@ -41,6 +44,7 @@ import static org.mockito.Mockito.when; public final class EnterprisePrivacyFeatureProviderImplTest { private final ComponentName DEVICE_OWNER = new ComponentName("dummy", "component"); + private final Date TIMESTAMP = new Date(2011, 11, 11); private @Mock DevicePolicyManagerWrapper mDevicePolicyManager; private @Mock PackageManagerWrapper mPackageManager; @@ -65,4 +69,32 @@ public final class EnterprisePrivacyFeatureProviderImplTest { when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(DEVICE_OWNER); assertThat(mProvider.hasDeviceOwner()).isTrue(); } + + @Test + public void testGetLastSecurityLogRetrievalTime() { + when(mDevicePolicyManager.getLastSecurityLogRetrievalTime()).thenReturn(-1L); + assertThat(mProvider.getLastSecurityLogRetrievalTime()).isNull(); + + when(mDevicePolicyManager.getLastSecurityLogRetrievalTime()) + .thenReturn(TIMESTAMP.getTime()); + assertThat(mProvider.getLastSecurityLogRetrievalTime()).isEqualTo(TIMESTAMP); + } + + @Test + public void testGetLastBugReportRequestTime() { + when(mDevicePolicyManager.getLastBugReportRequestTime()).thenReturn(-1L); + assertThat(mProvider.getLastBugReportRequestTime()).isNull(); + + when(mDevicePolicyManager.getLastBugReportRequestTime()).thenReturn(TIMESTAMP.getTime()); + assertThat(mProvider.getLastBugReportRequestTime()).isEqualTo(TIMESTAMP); + } + + @Test + public void testGetLastNetworkLogRetrievalTime() { + when(mDevicePolicyManager.getLastNetworkLogRetrievalTime()).thenReturn(-1L); + assertThat(mProvider.getLastNetworkLogRetrievalTime()).isNull(); + + when(mDevicePolicyManager.getLastNetworkLogRetrievalTime()).thenReturn(TIMESTAMP.getTime()); + assertThat(mProvider.getLastNetworkLogRetrievalTime()).isEqualTo(TIMESTAMP); + } } diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java index 28db647c3a7..f6e18c65fc1 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java @@ -73,7 +73,10 @@ public final class EnterprisePrivacySettingsTest { final List controllers = mSettings.getPreferenceControllers( ShadowApplication.getInstance().getApplicationContext()); assertThat(controllers).isNotNull(); - assertThat(controllers.size()).isEqualTo(1); + assertThat(controllers.size()).isEqualTo(4); assertThat(controllers.get(0)).isInstanceOf(InstalledPackagesPreferenceController.class); + assertThat(controllers.get(1)).isInstanceOf(NetworkLogsPreferenceController.class); + assertThat(controllers.get(2)).isInstanceOf(BugReportsPreferenceController.class); + assertThat(controllers.get(3)).isInstanceOf(SecurityLogsPreferenceController.class); } } diff --git a/tests/robotests/src/com/android/settings/enterprise/InstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/InstalledPackagesPreferenceControllerTest.java index fe41faaf05f..79db853c83b 100644 --- a/tests/robotests/src/com/android/settings/enterprise/InstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/InstalledPackagesPreferenceControllerTest.java @@ -73,7 +73,8 @@ public final class InstalledPackagesPreferenceControllerTest { return null; }}).when(mFeatureFactory.applicationFeatureProvider) .calculateNumberOfInstalledApps(anyObject()); - when(mContext.getResources().getQuantityString(R.plurals.number_installed_packages, 20, 20)) + when(mContext.getResources().getQuantityString( + R.plurals.enterprise_privacy_number_installed_packages, 20, 20)) .thenReturn("20 packages"); mController.updateState(preference); assertThat(preference.getTitle()).isEqualTo("20 packages"); diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java new file mode 100644 index 00000000000..fe9fcf6efdb --- /dev/null +++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2016 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 com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.TestConfig; +import com.android.settings.testutils.FakeFeatureFactory; + +import org.junit.runner.RunWith; +import org.robolectric.annotation.Config; + +import java.util.Date; + +import static org.mockito.Mockito.when; + +/** + * Tests for {@link NetworkLogsPreferenceController}. + */ +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public final class NetworkLogsPreferenceControllerTest extends + AdminActionPreferenceControllerTestBase { + + @Override + public void setUp() { + super.setUp(); + mController = new NetworkLogsPreferenceController(mContext); + } + + @Override + public void setDate(Date date) { + when(mFeatureFactory.enterprisePrivacyFeatureProvider.getLastNetworkLogRetrievalTime()) + .thenReturn(date); + } + + @Override + public String getPreferenceKey() { + return "network_logs"; + } +} diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java new file mode 100644 index 00000000000..b260d61d433 --- /dev/null +++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2016 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 com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.TestConfig; +import com.android.settings.testutils.FakeFeatureFactory; + +import org.junit.runner.RunWith; +import org.robolectric.annotation.Config; + +import java.util.Date; + +import static org.mockito.Mockito.when; + +/** + * Tests for {@link SecurityLogsPreferenceController}. + */ +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public final class SecurityLogsPreferenceControllerTest extends + AdminActionPreferenceControllerTestBase { + + @Override + public void setUp() { + super.setUp(); + mController = new SecurityLogsPreferenceController(mContext); + } + + @Override + public void setDate(Date date) { + when(mFeatureFactory.enterprisePrivacyFeatureProvider.getLastSecurityLogRetrievalTime()) + .thenReturn(date); + } + + @Override + public String getPreferenceKey() { + return "security_logs"; + } +}