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

Commit a112226d authored by Lenka Trochtova's avatar Lenka Trochtova
Browse files

Enterprice privacy: let the user know if admin enabled backups. 

Bug: 73750212
Bug: 64012357
Test: make RunSettingsGoogleRoboTests

Change-Id: I586eaccaebb89a8b3e5b4014b3d6427ab2eb15a9
parent a62df616

res/xml/enterprise_privacy_settings.xml

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ 
        <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"

src/com/android/settings/enterprise/BackupsEnabledPreferenceController.java

0 → 100644
+37 −0
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;

    }

}

src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java

+5 −0
Original line number Diff line number Diff line
@@ -124,4 +124,9 @@ public interface EnterprisePrivacyFeatureProvider { 
     * profile (if any).

     */

    int getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile();



    /*

     * Returns whether backups are mandatory.

     */

    boolean areBackupsMandatory();

}

src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java

+5 −0
Original line number Diff line number Diff line
@@ -235,6 +235,11 @@ 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;

src/com/android/settings/enterprise/EnterprisePrivacySettings.java

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 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));