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

Commit 8aa523f1 authored by Michael Groover's avatar Michael Groover
Browse files

Add developer option for device identifier restrictions 

Bug: 123646983
Test: Manually verified device_config switch was toggled via
      the new developer option.

Change-Id: I6a4e2d1f7bfdaae402e594e7ebc1b845bf12996e
parent 3a7cbacd

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -5830,6 +5830,10 @@ 
    <string name="sms_access_restriction_enabled">Restrict SMS &amp; call log access</string>

    <!-- Summary for whether to enable SMS access restriction [CHAR LIMIT=NONE]-->

    <string name="sms_access_restriction_enabled_summary">Only default phone and messaging apps have SMS &amp; call log permissions</string>

    <!-- Title for the new device identifier access restrictions [CHAR LIMIT=50]-->

    <string name="device_identifier_access_restrictions_title">Enable device identifier restrictions</string>

    <!-- Summary for the new device identifier access restrictions [CHAR LIMIT=NONE]-->

    <string name="device_identifier_access_restrictions_summary">Enable the new access restrictions for device identifiers.</string>





























    <!-- Message when there are no available trust agents to display -->

































res/xml/development_settings.xml



+5
−0




























Original line number
Diff line number
Diff line








@@ -534,6 +534,11 @@













            android:key="sms_access_restriction_enabled"















            android:title="@string/sms_access_restriction_enabled"















            android:summary="@string/sms_access_restriction_enabled_summary" />



























        <SwitchPreference













            android:key="device_identifier_access_restrictions"













            android:title="@string/device_identifier_access_restrictions_title"













            android:summary="@string/device_identifier_access_restrictions_summary" />















    </PreferenceCategory>































    <com.android.settings.development.autofill.AutofillPreferenceCategory

































src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -479,6 +479,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra













        controllers.add(new FreeformWindowsPreferenceController(context));















        controllers.add(new DesktopModePreferenceController(context));















        controllers.add(new SmsAccessRestrictionPreferenceController(context));













        controllers.add(new DeviceIdentifierAccessRestrictionsPreferenceController(context));















        controllers.add(new ShortcutManagerThrottlingPreferenceController(context));















        controllers.add(new EnableGnssRawMeasFullTrackingPreferenceController(context));















        controllers.add(new DefaultLaunchPreferenceController(context, "running_apps"));

































src/com/android/settings/development/DeviceIdentifierAccessRestrictionsPreferenceController.java
0 → 100644



+70
−0




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2019 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.development;



























import android.content.Context;













import android.provider.DeviceConfig;



























import androidx.preference.Preference;













import androidx.preference.SwitchPreference;



























import com.android.settings.core.PreferenceControllerMixin;













import com.android.settingslib.development.DeveloperOptionsPreferenceController;



























public class DeviceIdentifierAccessRestrictionsPreferenceController













        extends DeveloperOptionsPreferenceController













        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {



























    private static final String DEVICE_IDENTIFIER_ACCESS_RESTRICTIONS_KEY =













            "device_identifier_access_restrictions";



























    public DeviceIdentifierAccessRestrictionsPreferenceController(Context context) {













        super(context);













    }



























    @Override













    public String getPreferenceKey() {













        return DEVICE_IDENTIFIER_ACCESS_RESTRICTIONS_KEY;













    }



























    @Override













    public boolean onPreferenceChange(Preference preference, Object newValue) {













        writeSetting((boolean) newValue);













        return true;













    }



























    private void writeSetting(boolean isEnabled) {













        DeviceConfig.setProperty(DeviceConfig.Privacy.NAMESPACE,













                DeviceConfig.Privacy.PROPERTY_DEVICE_IDENTIFIER_ACCESS_RESTRICTIONS_DISABLED,













                String.valueOf(!isEnabled), false);













    }



























    @Override













    public void updateState(Preference preference) {













        boolean isEnabled = !Boolean.parseBoolean(













                DeviceConfig.getProperty(DeviceConfig.Privacy.NAMESPACE,













                        DeviceConfig.Privacy.PROPERTY_DEVICE_IDENTIFIER_ACCESS_RESTRICTIONS_DISABLED));













        ((SwitchPreference) mPreference).setChecked(isEnabled);













    }



























    @Override













    protected void onDeveloperOptionsSwitchDisabled() {













        super.onDeveloperOptionsSwitchDisabled();













        writeSetting(true);













        ((SwitchPreference) mPreference).setChecked(true);













    }













}