From 91c3c2a9f059c4e679a4732fffddc426f08ad4a6 Mon Sep 17 00:00:00 2001
From: Joanne Chung <joannechung@google.com>
Date: Wed, 3 Jun 2020 15:36:08 +0800
Subject: [PATCH] Made AutofillId.withoutSession is testable.

Bug: 156408900
Test: atest android.autofillservice.cts.inline.\
InlineAugmentedWebViewActivityTest

Change-Id: I27d1227f858aac83b3de1cb8ef719edf177524dc
---
 api/test-current.txt                            | 1 +
 core/java/android/view/autofill/AutofillId.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/api/test-current.txt b/api/test-current.txt
index 4dcc746b1acbe..1a4c9ae4bda02 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -5130,6 +5130,7 @@ package android.view.autofill {
     ctor public AutofillId(int, int);
     ctor public AutofillId(@NonNull android.view.autofill.AutofillId, long, int);
     method public boolean equalsIgnoreSession(@Nullable android.view.autofill.AutofillId);
+    method @NonNull public static android.view.autofill.AutofillId withoutSession(@NonNull android.view.autofill.AutofillId);
   }
 
   public final class AutofillManager {
diff --git a/core/java/android/view/autofill/AutofillId.java b/core/java/android/view/autofill/AutofillId.java
index 68943bf2a83a0..32b9cf7cdbb01 100644
--- a/core/java/android/view/autofill/AutofillId.java
+++ b/core/java/android/view/autofill/AutofillId.java
@@ -73,6 +73,8 @@ public final class AutofillId implements Parcelable {
     }
 
     /** @hide */
+    @NonNull
+    @TestApi
     public static AutofillId withoutSession(@NonNull AutofillId id) {
         final int flags = id.mFlags & ~FLAG_HAS_SESSION;
         final long virtualChildId =