Merge "Enable GuardedBy annotation in support library."
diff --git a/core-utils/java/android/support/v4/content/FileProvider.java b/core-utils/java/android/support/v4/content/FileProvider.java
index 9e82d63..c49fc12 100644
--- a/core-utils/java/android/support/v4/content/FileProvider.java
+++ b/core-utils/java/android/support/v4/content/FileProvider.java
@@ -32,6 +32,7 @@
import android.os.Environment;
import android.os.ParcelFileDescriptor;
import android.provider.OpenableColumns;
+import android.support.annotation.GuardedBy;
import android.text.TextUtils;
import android.webkit.MimeTypeMap;
@@ -339,7 +340,7 @@
private static final File DEVICE_ROOT = new File("/");
- // @GuardedBy("sCache")
+ @GuardedBy("sCache")
private static HashMap<String, PathStrategy> sCache = new HashMap<String, PathStrategy>();
private PathStrategy mStrategy;
diff --git a/emoji/core/src/android/support/text/emoji/EmojiCompat.java b/emoji/core/src/android/support/text/emoji/EmojiCompat.java
index 1a02cc9..cd235a3 100644
--- a/emoji/core/src/android/support/text/emoji/EmojiCompat.java
+++ b/emoji/core/src/android/support/text/emoji/EmojiCompat.java
@@ -21,6 +21,7 @@
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.AnyThread;
+import android.support.annotation.GuardedBy;
import android.support.annotation.IntDef;
import android.support.annotation.IntRange;
import android.support.annotation.NonNull;
@@ -90,13 +91,16 @@
"android.support.text.emoji.emojiCompat_replaceAll";
private static final Object sInstanceLock = new Object();
- // @GuardedBy("sInstanceLock")
+
+ @GuardedBy("sInstanceLock")
private static volatile EmojiCompat sInstance;
private final ReadWriteLock mInitLock;
- // @GuardedBy("mInitLock")
+
+ @GuardedBy("mInitLock")
private final Set<InitCallback> mInitCallbacks;
- // @GuardedBy("mInitLock")
+
+ @GuardedBy("mInitLock")
@LoadState
private int mLoadState;
diff --git a/emoji/core/src/android/support/text/emoji/widget/EmojiEditableFactory.java b/emoji/core/src/android/support/text/emoji/widget/EmojiEditableFactory.java
index 561d37a..1279b31 100644
--- a/emoji/core/src/android/support/text/emoji/widget/EmojiEditableFactory.java
+++ b/emoji/core/src/android/support/text/emoji/widget/EmojiEditableFactory.java
@@ -15,6 +15,7 @@
*/
package android.support.text.emoji.widget;
+import android.support.annotation.GuardedBy;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.Editable;
@@ -38,7 +39,7 @@
*/
final class EmojiEditableFactory extends Editable.Factory {
private static final Object sInstanceLock = new Object();
- // @GuardedBy("sInstanceLock")
+ @GuardedBy("sInstanceLock")
private static volatile Editable.Factory sInstance;
@Nullable private static Class<?> sWatcherClass;
diff --git a/emoji/core/tests/java/android/support/text/emoji/TestConfigBuilder.java b/emoji/core/tests/java/android/support/text/emoji/TestConfigBuilder.java
index 5e276a2..bc3eec9 100644
--- a/emoji/core/tests/java/android/support/text/emoji/TestConfigBuilder.java
+++ b/emoji/core/tests/java/android/support/text/emoji/TestConfigBuilder.java
@@ -18,6 +18,7 @@
import static org.junit.Assert.fail;
import android.content.res.AssetManager;
+import android.support.annotation.GuardedBy;
import android.support.test.InstrumentationRegistry;
import java.util.concurrent.CountDownLatch;
@@ -85,7 +86,7 @@
public static class TestEmojiDataLoader implements EmojiCompat.MetadataLoader {
static final Object sMetadataRepoLock = new Object();
// keep a static instance to in order not to slow down the tests
- // @GuardedBy("sMetadataRepoLock")
+ @GuardedBy("sMetadataRepoLock")
static volatile MetadataRepo sMetadataRepo;
TestEmojiDataLoader() {