commit 54d5d5a2c635e496f0708c96cb11b684b576e64e
author Seigo Nonaka <nona@google.com> Mon Oct 16 13:04:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 16 13:04:16 2017 +0000
tree 09bacb788647bf59851d68398e507ab0542291a9
parent f657d78755f7cde88e064a6d23c6aa0f8ac99b49
parent 1f11788de2c6be7af5790e4d6fbc4b8a8d7a5b26

Fix a crash
am: 1f11788de2

Change-Id: I92c480a0d4901c0303f51966e3c52bd199f92331

compat/src/main/java/android/support/v4/provider/FontsContractCompat.java

diff --git a/compat/src/main/java/android/support/v4/provider/FontsContractCompat.java b/compat/src/main/java/android/support/v4/provider/FontsContractCompat.java
index 9ef1b0b..0926186 100644
--- a/compat/src/main/java/android/support/v4/provider/FontsContractCompat.java
+++ b/compat/src/main/java/android/support/v4/provider/FontsContractCompat.java
@@ -303,6 +303,9 @@
                     final ArrayList<ReplyCallback<TypefaceResult>> replies;
                     synchronized (sLock) {
                         replies = sPendingReplies.get(id);
+                        if (replies == null) {
+                            return;  // Nobody requested replies. Do nothing.
+                        }
                         sPendingReplies.remove(id);
                     }
                     for (int i = 0; i < replies.size(); ++i) {