| Index: components/cronet/android/api/src/org/chromium/net/RequestFinishedInfo.java
|
| diff --git a/components/cronet/android/api/src/org/chromium/net/RequestFinishedInfo.java b/components/cronet/android/api/src/org/chromium/net/RequestFinishedInfo.java
|
| index 8c681727db96eeda9d4131ee18a0c60e5a5d0774..40bdb1e266d7fa265a724723bc4f85c91d0a2337 100644
|
| --- a/components/cronet/android/api/src/org/chromium/net/RequestFinishedInfo.java
|
| +++ b/components/cronet/android/api/src/org/chromium/net/RequestFinishedInfo.java
|
| @@ -10,6 +10,7 @@ import android.support.annotation.Nullable;
|
| import java.lang.annotation.Retention;
|
| import java.lang.annotation.RetentionPolicy;
|
| import java.util.Collection;
|
| +import java.util.Collections;
|
| import java.util.Date;
|
| import java.util.concurrent.Executor;
|
|
|
| @@ -298,6 +299,9 @@ public final class RequestFinishedInfo {
|
|
|
| /** Returns the objects that the caller has supplied when initiating the request. */
|
| public Collection<Object> getAnnotations() {
|
| + if (mAnnotations == null) {
|
| + return Collections.emptyList();
|
| + }
|
| return mAnnotations;
|
| }
|
|
|
|
|