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

Revert the mandatory backups feature.

Browse Source 
Bug: 79736299
Test: make RunSettingsGoogleRoboTests
Test: make RunSettingsRoboTests

Change-Id: Ie9702664c0fb4daccdee74eac6080c959fe1b608
This commit is contained in:
Lenka Trochtova
2018-08-09 15:15:18 +02:00
parent d67668a1c3
commit 2f4558d3fc
11 changed files with 1 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -8948,8 +8948,6 @@
<string name="disabled_by_policy_title_camera">Camera not allowed</string>
<!-- Title for dialog displayed to tell user that screenshots are disabled by an admin [CHAR LIMIT=50] -->
<string name="disabled_by_policy_title_screen_capture">Screenshot not allowed</string>
<!-- Title for dialog displayed to tell user that turning off backups is disallowed by an admin [CHAR LIMIT=50] -->
<string name="disabled_by_policy_title_turn_off_backups">Can’t turn off backups</string>
<!-- Title for dialog displayed to tell user that the app was suspended by an admin [CHAR LIMIT=50] -->
<string name="disabled_by_policy_title_suspend_packages">Can’t open this app</string>
<!-- Shown when the user tries to change a settings locked by an admin [CHAR LIMIT=200] -->
@@ -9749,8 +9747,6 @@
<item quantity="one"><xliff:g id="count">%d</xliff:g> attempt</item>
<item quantity="other"><xliff:g id="count">%d</xliff:g> attempts</item>
</plurals>
<!-- List item in a work device's settings. This text lets the user know that their IT administrator requires their device's data to be backed up. The user can't change this setting. [CHAR LIMIT=NONE] -->
<string name="enterprise_privacy_backups_enabled">This device\'s data is being backed up</string>
<!-- Message indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=NONE] -->
<string name="do_disclosure_generic">This device is managed by your organization.</string>
<!-- Message indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=NONE] -->

3
res/xml/enterprise_privacy_settings.xml
View File

@@ -83,9 +83,6 @@
<Preference android:key="ca_certs_managed_profile"
android:title="@string/enterprise_privacy_ca_certs_work"
android:selectable="false"/>
<Preference android:key="backups_enabled"
android:title="@string/enterprise_privacy_backups_enabled"
android:selectable="false"/>
</PreferenceCategory>
<PreferenceCategory android:key="device_access_category"

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

@@ -137,9 +137,6 @@ public class ActionDisabledByAdminDialogHelper {
case DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE:
titleView.setText(R.string.disabled_by_policy_title_screen_capture);
break;
case DevicePolicyManager.POLICY_MANDATORY_BACKUPS:
titleView.setText(R.string.disabled_by_policy_title_turn_off_backups);
break;
case DevicePolicyManager.POLICY_SUSPEND_PACKAGES:
titleView.setText(R.string.disabled_by_policy_title_suspend_packages);
break;

37
src/com/android/settings/enterprise/BackupsEnabledPreferenceController.java
View File

@@ -1,37 +0,0 @@
/*
* Copyright (C) 2018 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 com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
public class BackupsEnabledPreferenceController extends BasePreferenceController {
private static final String KEY_BACKUPS_ENABLED = "backups_enabled";
private final EnterprisePrivacyFeatureProvider mFeatureProvider;
public BackupsEnabledPreferenceController(Context context) {
super(context, KEY_BACKUPS_ENABLED);
mFeatureProvider = FeatureFactory.getFactory(context)
.getEnterprisePrivacyFeatureProvider(context);
}
@Override
public int getAvailabilityStatus() {
return mFeatureProvider.areBackupsMandatory() ? AVAILABLE : DISABLED_FOR_USER;
}
}

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

@@ -124,9 +124,4 @@ public interface EnterprisePrivacyFeatureProvider {
* profile (if any).
*/
int getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile();
/*
* Returns whether backups are mandatory.
*/
boolean areBackupsMandatory();
}

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

@@ -234,11 +234,6 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
return activeAdmins;
}
@Override
public boolean areBackupsMandatory() {
return null != mDpm.getMandatoryBackupTransport();
}
protected static class EnterprisePrivacySpan extends ClickableSpan {
private final Context mContext;

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

@@ -84,7 +84,6 @@ public class EnterprisePrivacySettings extends DashboardFragment {
exposureChangesCategoryControllers.add(new CaCertsCurrentUserPreferenceController(context));
exposureChangesCategoryControllers.add(new CaCertsManagedProfilePreferenceController(
context));
exposureChangesCategoryControllers.add(new BackupsEnabledPreferenceController(context));
controllers.addAll(exposureChangesCategoryControllers);
controllers.add(new PreferenceCategoryController(context, "exposure_changes_category")
.setChildren(exposureChangesCategoryControllers));

4
tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
View File

@@ -124,10 +124,6 @@ public class ActionDisabledByAdminDialogHelperTest {
assertEquals(Shadows.shadowOf(textView).innerText(),
mActivity.getString(R.string.disabled_by_policy_title_screen_capture));
mHelper.setAdminSupportTitle(view, DevicePolicyManager.POLICY_MANDATORY_BACKUPS);
assertEquals(Shadows.shadowOf(textView).innerText(),
mActivity.getString(R.string.disabled_by_policy_title_turn_off_backups));
mHelper.setAdminSupportTitle(view, DevicePolicyManager.POLICY_SUSPEND_PACKAGES);
assertEquals(Shadows.shadowOf(textView).innerText(),
mActivity.getString(R.string.disabled_by_policy_title_suspend_packages));

73
tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java
View File

@@ -1,73 +0,0 @@
/*
* Copyright (C) 2018 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 static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
public class BackupsEnabledPreferenceControllerTest {
private static final String KEY_BACKUPS_ENABLED = "backups_enabled";
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
private BackupsEnabledPreferenceController mController;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new BackupsEnabledPreferenceController(mContext);
}
@Test
public void testIsAvailable() {
when(mFeatureFactory.enterprisePrivacyFeatureProvider.areBackupsMandatory())
.thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
when(mFeatureFactory.enterprisePrivacyFeatureProvider.areBackupsMandatory())
.thenReturn(true);
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(KEY_BACKUPS_ENABLED);
}
}

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

@@ -346,15 +346,6 @@ public class EnterprisePrivacyFeatureProviderImplTest {
.isEqualTo(3);
}
@Test
public void testAreBackupsMandatory() {
assertThat(mProvider.areBackupsMandatory()).isFalse();
ComponentName transportComponent = new ComponentName("test", "test");
when(mDevicePolicyManager.getMandatoryBackupTransport())
.thenReturn(transportComponent);
assertThat(mProvider.areBackupsMandatory()).isTrue();
}
private void resetAndInitializePackageManager() {
reset(mPackageManager);
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN))

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

@@ -99,7 +99,7 @@ public class EnterprisePrivacySettingsTest {
private void verifyPreferenceControllers(List<AbstractPreferenceController> controllers) {
assertThat(controllers).isNotNull();
assertThat(controllers.size()).isEqualTo(18);
assertThat(controllers.size()).isEqualTo(17);
int position = 0;
assertThat(controllers.get(position++)).isInstanceOf(NetworkLogsPreferenceController.class);
assertThat(controllers.get(position++)).isInstanceOf(BugReportsPreferenceController.class);
@@ -126,8 +126,6 @@ public class EnterprisePrivacySettingsTest {
CaCertsCurrentUserPreferenceController.class);
assertThat(controllers.get(position++)).isInstanceOf(
CaCertsManagedProfilePreferenceController.class);
assertThat(controllers.get(position++)).isInstanceOf(
BackupsEnabledPreferenceController.class);
assertThat(controllers.get(position++)).isInstanceOf(
PreferenceCategoryController.class);
assertThat(controllers.get(position++)).isInstanceOf(