commit fcb10a09daed31dbaa0e1dbac3d07806a6307189
author Felipe Leme <felipeal@google.com> Tue Aug 07 12:36:35 2018 -0700
committer Felipe Leme <felipeal@google.com> Fri Aug 17 14:31:05 2018 -0700
tree 228e538e1c63f35127ade3d9898bb5d362139639
parent 726df7efc9e8faad94ee8133fcb4fd976b66ebda

Fixed OneTimeListener so AUTOFILL_SAVE_UI metric is properly saved.

Test: adb shell logcat -b events | grep sysui
Test: atest CtsAutoFillServiceTestCases # to make sure it didn't break anything

Fixes: 112315388

Change-Id: Iecf374578b33a4fcfa84fe4f07613e05c9777fa9
(cherry picked from commit 373d49ebe8d21410ea0d334d2fd99435f128325e)

services/autofill/java/com/android/server/autofill/ui/SaveUi.java

diff --git a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java
index dc84498..5882303 100644
--- a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java
+++ b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java
@@ -81,6 +81,13 @@
         void onDestroy();
     }
 
+    /**
+     * Wrapper that guarantees that only one callback is triggered by ignoring further calls after
+     * it's destroyed.
+     *
+     * <p>It's needed becase {@link #onCancel(IntentSender)} is always called when the Save UI
+     * dialog is dismissed.
+     */
     private class OneTimeListener implements OnSaveListener {
 
         private final OnSaveListener mRealListener;
@@ -96,7 +103,6 @@
             if (mDone) {
                 return;
             }
-            mDone = true;
             mRealListener.onSave();
         }
 
@@ -106,7 +112,6 @@
             if (mDone) {
                 return;
             }
-            mDone = true;
             mRealListener.onCancel(listener);
         }