summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJon Dormody <jond@google.com>2017-12-01 16:28:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-12-01 16:28:29 +0000
commitf506b49aa64a9f80c873eeb171997e99df4a1157 (patch)
treed103878f4b21cf3c4b53c556f630cfa4ff6db117 /core/java/android
parent9020d22c6d51ca798efd634aead72c2217da9584 (diff)
parent37db2694eb6f345958db1a99f64f141aa06a13db (diff)
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev am: fb839ce59a am: 728ca235b5
am: 37db2694eb Change-Id: I98151cf907cd2f635c8f4a0e128ff697024b3a54
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/Context.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 7e2ac6372841..1d651b9da864 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -754,6 +754,8 @@ public abstract class Context {
* to any callers for the same name, meaning they will see each other's
* edits as soon as they are made.
*
+ * This method is thead-safe.
+ *
* @param name Desired preferences file. If a preferences file by this name
* does not exist, it will be created when you retrieve an
* editor (SharedPreferences.edit()) and then commit changes (Editor.commit()).