commit f506b49aa64a9f80c873eeb171997e99df4a1157
author Jon Dormody <jond@google.com> Fri Dec 01 16:28:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 01 16:28:29 2017 +0000
tree d103878f4b21cf3c4b53c556f630cfa4ff6db117
parent 9020d22c6d51ca798efd634aead72c2217da9584
parent 37db2694eb6f345958db1a99f64f141aa06a13db

Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev am: fb839ce59a am: 728ca235b5
am: 37db2694eb

Change-Id: I98151cf907cd2f635c8f4a0e128ff697024b3a54

core/java/android/content/Context.java

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 7e2ac63..1d651b9 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -754,6 +754,8 @@
      * 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()).