summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorRuslan Tkhakokhov <rthakohov@google.com>2020-03-11 15:34:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-03-11 15:34:09 +0000
commitd0effa24922fe8a7073e5bca1c819337f6ddbf09 (patch)
treeb52f840fbb0c4db8d39e1a4ae1c390d5c64563d1 /core/java
parentd514712c004d095385ef8cb0be0621f676a9ff09 (diff)
parent71888e5fa1a6b1629076bd929fd8e307bef44f5d (diff)
Merge "Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission" into rvc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Settings.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 641de4a71142..084f37f1a610 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -98,7 +98,8 @@ import java.util.Set;
* The Settings provider contains global system-level device preferences.
*/
public final class Settings {
- private static final boolean DEFAULT_OVERRIDEABLE_BY_RESTORE = false;
+ /** @hide */
+ public static final boolean DEFAULT_OVERRIDEABLE_BY_RESTORE = false;
// Intent actions for Settings