commit 99ef6d2545c0c826470f12900af02ce208ec37de
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jun 07 17:43:16 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 07 17:43:16 2024 +0000
tree 7d3ba42fd72a7e47a0c0d7f73dbe913498eee5a2
parent b09c5aeae4eee1cea103a2ea0ee5c4dea884e704
parent 3dc6a7f6bea4d2a5109751e5704ca10923df1c08

Merge "Revert "Convert clipboard access to use new APIs"" into main

src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java

diff --git a/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java b/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
index bd829b5..ad57073 100644
--- a/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
+++ b/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
@@ -19,6 +19,7 @@
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.provider.DeviceConfig;
+import android.provider.Settings;
 
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
@@ -37,25 +38,26 @@
 
     private static final String KEY_SHOW_CLIP_ACCESS_NOTIFICATION = "show_clip_access_notification";
 
-    private Preference mPreference;
-    private final ClipboardManager mClipboardManager;
     private final DeviceConfig.OnPropertiesChangedListener mDeviceConfigListener =
-            properties -> updateState(mPreference);
+            properties -> updateConfig();
+    private boolean mDefault;
+    private Preference mPreference;
 
     public ShowClipAccessNotificationPreferenceController(Context context) {
         super(context, KEY_SHOW_CLIP_ACCESS_NOTIFICATION);
-        mClipboardManager = context.getSystemService(ClipboardManager.class);
-        updateState(mPreference);
+        updateConfig();
     }
 
     @Override
     public boolean isChecked() {
-        return mClipboardManager.areClipboardAccessNotificationsEnabled();
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, (mDefault ? 1 : 0)) != 0;
     }
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        mClipboardManager.setClipboardAccessNotificationsEnabled(isChecked);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, (isChecked ? 1 : 0));
         return true;
     }
 
@@ -92,4 +94,12 @@
     public void onStop() {
         DeviceConfig.removeOnPropertiesChangedListener(mDeviceConfigListener);
     }
+
+    private void updateConfig() {
+        mDefault = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_CLIPBOARD,
+                ClipboardManager.DEVICE_CONFIG_SHOW_ACCESS_NOTIFICATIONS,
+                ClipboardManager.DEVICE_CONFIG_DEFAULT_SHOW_ACCESS_NOTIFICATIONS);
+        updateState(mPreference);
+    }
+
 }