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

Populate Enterprise Privacy Settings page - batch 2

Browse Source 
This CL adds the second batch of items to the Privacy Settings page.

These are all the remaining items that fall into the "What types of
information can your organization see?" category.

Test: make RunSettingsRoboTests
Bug: 32692748
Change-Id: I08569646ed6bb6f5d9d6d65ed2718be8456f50ae
This commit is contained in:
Bartosz Fabianowski
2016-11-28 21:13:30 +01:00
parent 51ecc5eced
commit 2e0b608495
20 changed files with 650 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/values/strings.xml
View File

@@ -7983,20 +7983,28 @@
<!-- Enterprise Privacy settings activity header, summarizing the powers that the admin has. [CHAR LIMIT=NONE] -->
<string name="enterprise_privacy_header">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.</string>
<!-- Title for the 'What types of information can your organization see?' preference category. [CHAR LIMIT=60] -->
<string name="exposure_category">What types of information can your organization see?</string>
<string name="enterprise_privacy_exposure_category">What types of information can your organization see?</string>
<!-- Title for the 'What changes affect what your organization can see?' preference category. [CHAR LIMIT=60] -->
<string name="exposure_changes_category">What changes affect what your organization can see?</string>
<string name="enterprise_privacy_exposure_changes_category">What changes affect what your organization can see?</string>
<!-- Title for the 'What actions may impact your access to this device?' preference category. [CHAR LIMIT=60] -->
<string name="device_access_category">What actions may impact your access to this device?</string>
<string name="enterprise_privacy_device_access_category">What actions may impact your access to this device?</string>
<!-- Label explaining that the admin can see data associated with his/her work account. [CHAR LIMIT=NONE] -->
<string name="enterprise_data">Data associated with your work account, such as email and calendar</string>
<string name="enterprise_privacy_enterprise_data">Data associated with your work account, such as email and calendar</string>
<!-- Label explaining that the admin can see all apps installed on the device. [CHAR LIMIT=NONE] -->
<string name="number_installed_packages_default">List of all apps on your device</string>
<string name="enterprise_privacy_number_installed_packages_default">List of all apps on your device</string>
<!-- Label explaining that the admin can see all apps installed on the device. [CHAR LIMIT=NONE] -->
<plurals name="number_installed_packages">
<plurals name="enterprise_privacy_number_installed_packages">
<item quantity="one">List of all <xliff:g id="count">%d</xliff:g> app on your device</item>
<item quantity="other">List of all <xliff:g id="count">%d</xliff:g> apps on your device</item>
</plurals>
<!-- Label explaining that the admin can see app usage statistics. [CHAR LIMIT=NONE] -->
<string name="usage_stats">Usage (time spent and amount of data used) of each app on your device</string>
<string name="enterprise_privacy_usage_stats">Usage (time spent and amount of data used) of each app on your device</string>
<!-- Label explaining that the admin can retrieve network logs on the device. [CHAR LIMIT=NONE] -->
<string name="enterprise_privacy_network_logs">Traffic logs on your device</string>
<!-- Label explaining that the admin can request bug reports on the device. [CHAR LIMIT=NONE] -->
<string name="enterprise_privacy_bug_reports">Your most recent bug report</string>
<!-- Label explaining that the admin can retrieve security on from the device. [CHAR LIMIT=NONE] -->
<string name="enterprise_privacy_security_logs">Your most recent security log</string>
<!-- Label indicating that the date at which the admin last took a particular action was "never" (i.e. the admin never took the action so far). -->
<string name="enterprise_privacy_never">Never</string>
</resources>

27
res/xml/enterprise_privacy_settings.xml
View File

@@ -24,28 +24,43 @@
android:summary="@string/enterprise_privacy_header"
android:selectable="false"/>
<PreferenceCategory android:title="@string/exposure_category">
<PreferenceCategory android:title="@string/enterprise_privacy_exposure_category">
<com.android.settings.DividerPreference
android:key="enterprise_data"
android:layout_height="wrap_content"
android:title="@string/enterprise_data"
android:title="@string/enterprise_privacy_enterprise_data"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="number_installed_packages"
android:title="@string/number_installed_packages_default"
android:title="@string/enterprise_privacy_number_installed_packages_default"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="usage_stats"
android:title="@string/usage_stats"
android:title="@string/enterprise_privacy_usage_stats"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="network_logs"
android:title="@string/enterprise_privacy_network_logs"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="bug_reports"
android:title="@string/enterprise_privacy_bug_reports"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="security_logs"
android:title="@string/enterprise_privacy_security_logs"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/exposure_changes_category">
<PreferenceCategory android:title="@string/enterprise_privacy_exposure_changes_category">
</PreferenceCategory>
<PreferenceCategory android:title="@string/device_access_category">
<PreferenceCategory android:title="@string/enterprise_privacy_device_access_category">
</PreferenceCategory>
</PreferenceScreen>

58
src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java Normal file
View File

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

37
src/com/android/settings/enterprise/BugReportsPreferenceController.java Normal file
View File

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

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

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

15
src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
View File

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

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

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

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

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

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

@@ -58,6 +58,9 @@ public class EnterprisePrivacySettings extends DashboardFragment {
protected List<PreferenceController> getPreferenceControllers(Context context) {
final List controllers = new ArrayList<PreferenceController>();
controllers.add(new InstalledPackagesPreferenceController(context));
controllers.add(new NetworkLogsPreferenceController(context));
controllers.add(new BugReportsPreferenceController(context));
controllers.add(new SecurityLogsPreferenceController(context));
return controllers;
}

2
src/com/android/settings/enterprise/InstalledPackagesPreferenceController.java
View File

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

37
src/com/android/settings/enterprise/NetworkLogsPreferenceController.java Normal file
View File

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

37
src/com/android/settings/enterprise/SecurityLogsPreferenceController.java Normal file
View File

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

69
tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java Normal file
View File

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

94
tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java Normal file
View File

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

54
tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java Normal file
View File

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

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

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

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

@@ -73,7 +73,10 @@ public final class EnterprisePrivacySettingsTest {
final List<PreferenceController> 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);
}
}

3
tests/robotests/src/com/android/settings/enterprise/InstalledPackagesPreferenceControllerTest.java
View File

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

54
tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java Normal file
View File

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

54
tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java Normal file
View File

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