diff options
| author | 2017-03-17 21:38:47 +0000 | |
|---|---|---|
| committer | 2017-03-17 21:38:51 +0000 | |
| commit | 9e284db838da9ed8dbe3d65ba8a7037801cff35b (patch) | |
| tree | 268524ac4b9b0bded9d9105a21859b13ea70b774 | |
| parent | 6c3489bc2909a0c8466c590efd76ce085f6d7b25 (diff) | |
| parent | c74d85fee82d5b938f54f96d8ddadb555d1e7a05 (diff) | |
Merge "Make SYNC_PARENT_SOUNDS a @SystemApi"
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index ea3e6e23113f..e58f4321c930 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -35020,6 +35020,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 */ |