From 56bddaab6818dceec105ca7b92b124dfb3c101d3 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Tue, 19 Mar 2019 12:47:24 -0700
Subject: [PATCH] Added @Nullable to ContentCaptureContext.getLocusId()

Test: m update-api
Fixes: 128922706

Change-Id: I541d0b33732069d6df85f6dbe12d1f599e4cb241
---
 api/current.txt                                                 | 2 +-
 .../java/android/view/contentcapture/ContentCaptureContext.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 79a909d3bed3d..2fb9a00aab8e5 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -53030,7 +53030,7 @@ package android.view.contentcapture {
     method public int describeContents();
     method @NonNull public static android.view.contentcapture.ContentCaptureContext forLocusId(@NonNull String);
     method @Nullable public android.os.Bundle getExtras();
-    method @NonNull public android.content.LocusId getLocusId();
+    method @Nullable public android.content.LocusId getLocusId();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.view.contentcapture.ContentCaptureContext> CREATOR;
   }
diff --git a/core/java/android/view/contentcapture/ContentCaptureContext.java b/core/java/android/view/contentcapture/ContentCaptureContext.java
index 019ebffccc13d..5a27e94aa4956 100644
--- a/core/java/android/view/contentcapture/ContentCaptureContext.java
+++ b/core/java/android/view/contentcapture/ContentCaptureContext.java
@@ -161,7 +161,7 @@ public final class ContentCaptureContext implements Parcelable {
     /**
      * Gets the context id.
      */
-    @NonNull
+    @Nullable
     public LocusId getLocusId() {
         return mId;
     }