commit 01f07e5fb78c6c0654ae0c280bdd006ce9114757
author Felipe Leme <felipeal@google.com> Tue Mar 19 22:33:33 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 19 22:33:33 2019 +0000
tree bed3d35075220442c9286ddc87b639c36e600b51
parent 6ce0f585416b7682593f96dca12b1b5a2d01511c
parent 56bddaab6818dceec105ca7b92b124dfb3c101d3

Merge "Added @Nullable to ContentCaptureContext.getLocusId()"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 7228ef4..3e7d626 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -53033,7 +53033,7 @@
     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;
   }

core/java/android/view/contentcapture/ContentCaptureContext.java

diff --git a/core/java/android/view/contentcapture/ContentCaptureContext.java b/core/java/android/view/contentcapture/ContentCaptureContext.java
index 019ebff..5a27e94 100644
--- a/core/java/android/view/contentcapture/ContentCaptureContext.java
+++ b/core/java/android/view/contentcapture/ContentCaptureContext.java
@@ -161,7 +161,7 @@
     /**
      * Gets the context id.
      */
-    @NonNull
+    @Nullable
     public LocusId getLocusId() {
         return mId;
     }