From f41869c430846354faebe973f4f1a0fc5c6c7ca0 Mon Sep 17 00:00:00 2001 From: octocorvus Date: Fri, 16 Aug 2024 08:10:04 +0000 Subject: [PATCH] fixup! add global per-user clipboard setting --- core/java/android/ext/settings/ExtSettings.java | 2 +- core/java/android/provider/Settings.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/java/android/ext/settings/ExtSettings.java b/core/java/android/ext/settings/ExtSettings.java index a9b425df3aab..59cd149101ce 100644 --- a/core/java/android/ext/settings/ExtSettings.java +++ b/core/java/android/ext/settings/ExtSettings.java @@ -66,7 +66,7 @@ public class ExtSettings { "persist.native_debug", defaultBool(R.bool.setting_default_allow_native_debugging)); public static final IntSetting CLIPBOARD_READ_ACCESS = new IntSetting( - Setting.Scope.PER_USER, "clipboard_read_access", + Setting.Scope.PER_USER, Settings.Secure.CLIPBOARD_READ_ACCESS, ClipboardReadSetting.DEFAULT, ClipboardReadSetting.VALID_VALUES); // AppCompatConfig specifies which hardening features are compatible/incompatible with a diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index fed10e97d9f5..138dd9e14ca4 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6757,6 +6757,9 @@ public static final class Secure extends NameValueTable { /** @hide */ public static final String SCRAMBLE_SIM_PIN_LAYOUT = "scramble_sim_pin_layout"; + /** @hide */ + public static final String CLIPBOARD_READ_ACCESS = "clipboard_read_access"; + // ExtSettings END // NOTE: If you add new settings here, be sure to add them to