commit 728ca235b5a8ec7953981bd69d6e9a33bf9e433a
author Jon Dormody <jond@google.com> Fri Dec 01 16:07:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 01 16:07:27 2017 +0000
tree c09ec2f08e8824766a749267e1b36162fa0c6c2f
parent 719e8b54126867dc8250ec40306b75b10e00915e
parent fb839ce59aeaf0bc2774091c3b7004a93f224d05

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

Change-Id: Ic135f510c6e5ff8a9a00f2d2be1fcc0c284dd5cf

core/java/android/content/Context.java

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 916fb7c..9af2828 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()).