Merge "unhide getId from BeginGetCredentialOption for jetpack"

core/api/current.txt

@@ -40286,6 +40286,7 @@ package android.service.credentials {
     ctor public BeginGetCredentialOption(@NonNull String, @NonNull String, @NonNull android.os.Bundle);
     method public int describeContents();
     method @NonNull public android.os.Bundle getCandidateQueryData();
+    method @NonNull public String getId();
     method @NonNull public String getType();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.service.credentials.BeginGetCredentialOption> CREATOR;

core/java/android/service/credentials/BeginGetCredentialOption.java

@@ -63,8 +63,6 @@ public class BeginGetCredentialOption implements Parcelable {
      * Returns the unique id associated with this request. Providers must pass this id
      * to the constructor of {@link CredentialEntry} while creating a candidate credential
      * entry for this request option.
-     *
-     * @hide
      */
     @NonNull
     public String getId() {