summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robin Lee <rgl@google.com> 2017-03-16 17:19:42 +0000
committer Robin Lee <rgl@google.com> 2017-03-17 19:11:20 +0000
commitc74d85fee82d5b938f54f96d8ddadb555d1e7a05 (patch)
tree8699b2f46eaa4f9c0c9ac3cbf9ffb58fdfd19372
parentc4a6d29ac6d8e7652c599c495ea83844e118119f (diff)
Make SYNC_PARENT_SOUNDS a @SystemApi
Since there is a CTS test depending on it which is currently hardcoding the string. Let's not do that. Bug: 30658854 Test: make full -j30 Change-Id: I6f6b1044ac664589b8fe76ced9961e80024b0b29
-rw-r--r--api/test-current.txt1
-rwxr-xr-xcore/java/android/provider/Settings.java2
2 files changed, 3 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt
index bb8b4540a9fd..e1434a280ecf 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -35004,6 +35004,7 @@ package android.provider {
field public static final java.lang.String SELECTED_INPUT_METHOD_SUBTYPE = "selected_input_method_subtype";
field public static final java.lang.String SETTINGS_CLASSNAME = "settings_classname";
field public static final java.lang.String SKIP_FIRST_USE_HINTS = "skip_first_use_hints";
+ field public static final java.lang.String SYNC_PARENT_SOUNDS = "sync_parent_sounds";
field public static final java.lang.String TOUCH_EXPLORATION_ENABLED = "touch_exploration_enabled";
field public static final deprecated java.lang.String TTS_DEFAULT_COUNTRY = "tts_default_country";
field public static final deprecated java.lang.String TTS_DEFAULT_LANG = "tts_default_lang";
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 391ee835e92a..7b84f6893982 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6630,6 +6630,8 @@ public final class Settings {
* This value is only used for managed profiles.
* @hide
*/
+ @TestApi
+ @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
public static final String SYNC_PARENT_SOUNDS = "sync_parent_sounds";
/** @hide */