Merge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into oc-dev

4 files changed, 2 insertions, 33 deletions

diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
index 502b5fc1ea6f..2bcc260b1c70 100644
--- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
@@ -283,13 +283,6 @@ public final class AutofillManagerService extends SystemService {
         }
     }
 
-    // Called by Shell command.
-    public void setSaveTimeout(int timeout) {
-        Slog.i(TAG, "setSaveTimeout("  + timeout + ")");
-        mContext.enforceCallingPermission(MANAGE_AUTO_FILL, TAG);
-        mUi.setSaveTimeout(timeout);
-    }
-
     /**
      * Removes a cached service for a given user.
      */
diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java
index 80560f18038e..6debc2fe26d7 100644
--- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java
@@ -47,8 +47,6 @@ public final class AutofillManagerServiceShellCommand extends ShellCommand {
         switch (cmd) {
             case "save":
                 return requestSave();
-            case "set":
-                return requestSet();
             case "list":
                 return requestList(pw);
             case "destroy":
@@ -76,9 +74,6 @@ public final class AutofillManagerServiceShellCommand extends ShellCommand {
             pw.println("  save [--user USER_ID]");
             pw.println("    Request provider to save contents of the top activity.");
             pw.println("");
-            pw.println("  set save_timeout MS");
-            pw.println("    Sets how long (in ms) the save snack bar is shown.");
-            pw.println("");
             pw.println("  reset");
             pw.println("    Reset all pending sessions and cached service connections.");
             pw.println("");
@@ -91,18 +86,6 @@ public final class AutofillManagerServiceShellCommand extends ShellCommand {
         return 0;
     }
 
-    private int requestSet() {
-        final String type = getNextArgRequired();
-        switch (type) {
-            case "save_timeout":
-                mService.setSaveTimeout(Integer.parseInt(getNextArgRequired()));
-                break;
-            default:
-                throw new IllegalArgumentException("Invalid 'set' type: " + type);
-        }
-        return 0;
-    }
-
     private int requestDestroy(PrintWriter pw) {
         if (!isNextArgSessions(pw)) {
             return -1;
diff --git a/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java b/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java
index 257256dc58e7..64dee584165e 100644
--- a/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java
+++ b/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java
@@ -262,7 +262,7 @@ public final class AutoFillUI {
                     }
                     mMetricsLogger.write(log);
                 }
-            }, mSaveTimeoutMs);
+            });
         });
     }
 
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 2c08afadf10b..d35cc95e6d26 100644
--- a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java
+++ b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java
@@ -98,7 +98,7 @@ final class SaveUi {
     private boolean mDestroyed;
 
     SaveUi(@NonNull Context context, @NonNull CharSequence providerLabel, @NonNull SaveInfo info,
-            @NonNull OnSaveListener listener, int lifeTimeMs) {
+            @NonNull OnSaveListener listener) {
         mListener = new OneTimeListener(listener);
 
         final LayoutInflater inflater = LayoutInflater.from(context);
@@ -169,13 +169,6 @@ final class SaveUi {
         window.getAttributes().width = WindowManager.LayoutParams.MATCH_PARENT;
 
         mDialog.show();
-
-        mHandler.postDelayed(() -> {
-            if (!mListener.mDone) {
-                mListener.onCancel(null);
-                Slog.d(TAG, "Save snackbar timed out after " + lifeTimeMs + "ms");
-            }
-        }, lifeTimeMs);
     }
 
     void destroy() {