Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a95584ee authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert the mandatory backups feature."

parents 75e2bdbc 2f4558d3
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -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] -->
+0 −3
Original line number Diff line number Diff line
@@ -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"
+0 −3
Original line number Diff line number Diff line
@@ -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;
+0 −37
Original line number Diff line number Diff line
/*
 * 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;
    }
}
+0 −5
Original line number Diff line number Diff line
@@ -124,9 +124,4 @@ public interface EnterprisePrivacyFeatureProvider {
     * profile (if any).
     */
    int getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile();

    /*
     * Returns whether backups are mandatory.
     */
    boolean areBackupsMandatory();
}
Loading