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

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