commit 37db2694eb6f345958db1a99f64f141aa06a13db
author Jon Dormody <jond@google.com> Fri Dec 01 16:16:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 01 16:16:53 2017 +0000
tree 2283688ee3ba52d886fe2e32388b0b48bcbd4899
parent d6ebb55c62f56d71ed389fdc1dda1ef53e256347
parent 728ca235b5a8ec7953981bd69d6e9a33bf9e433a

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

Change-Id: Ib6d81f2355ef9d902725e2e1ee1cd5337f4294ad

core/java/android/content/Context.java

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 792e8f3..a1e0679 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()).