From fcb6aff14c016ef398e80c4bad7140d0f007c48d Mon Sep 17 00:00:00 2001
From: Michael Groover <mpgroover@google.com>
Date: Wed, 6 Feb 2019 14:09:13 -0800
Subject: [PATCH] Change device ID developer setting to disable option

Bug: 123646983
Test: Manually verified toggling the option set the expected value
Change-Id: Ia219c154d9572111c4fce1af4128a103ba0409ec
---
 res/values/strings.xml                                      | 4 ++--
 ...iceIdentifierAccessRestrictionsPreferenceController.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 59374cf114a..10cf6c1684b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5851,9 +5851,9 @@
     <!-- 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>
+    <string name="device_identifier_access_restrictions_title">Disable 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>
+    <string name="device_identifier_access_restrictions_summary">Disable the new access restrictions for device identifiers</string>
 
 
     <!-- Message when there are no available trust agents to display -->
diff --git a/src/com/android/settings/development/DeviceIdentifierAccessRestrictionsPreferenceController.java b/src/com/android/settings/development/DeviceIdentifierAccessRestrictionsPreferenceController.java
index 1fdbe77641c..05ac8c760c0 100644
--- a/src/com/android/settings/development/DeviceIdentifierAccessRestrictionsPreferenceController.java
+++ b/src/com/android/settings/development/DeviceIdentifierAccessRestrictionsPreferenceController.java
@@ -50,12 +50,12 @@ public class DeviceIdentifierAccessRestrictionsPreferenceController
     private void writeSetting(boolean isEnabled) {
         DeviceConfig.setProperty(DeviceConfig.Privacy.NAMESPACE,
                 DeviceConfig.Privacy.PROPERTY_DEVICE_IDENTIFIER_ACCESS_RESTRICTIONS_DISABLED,
-                String.valueOf(!isEnabled), false);
+                String.valueOf(isEnabled), false);
     }
 
     @Override
     public void updateState(Preference preference) {
-        boolean isEnabled = !Boolean.parseBoolean(
+        boolean isEnabled = Boolean.parseBoolean(
                 DeviceConfig.getProperty(DeviceConfig.Privacy.NAMESPACE,
                         DeviceConfig.Privacy.PROPERTY_DEVICE_IDENTIFIER_ACCESS_RESTRICTIONS_DISABLED));
         ((SwitchPreference) mPreference).setChecked(isEnabled);
@@ -64,7 +64,7 @@ public class DeviceIdentifierAccessRestrictionsPreferenceController
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
         super.onDeveloperOptionsSwitchDisabled();
-        writeSetting(true);
+        writeSetting(false);
         ((SwitchPreference) mPreference).setChecked(true);
     }
 }