commit 0eb5390f69457907da46cb8be6a962b6b96b0ca7
author Ganesh Olekar <olekarg@google.com> Mon Feb 21 18:34:30 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 21 18:34:30 2022 +0000
tree ddda62ee977e0fbf28e9ad2e14e9443202faccac
parent 01cadddef429b45442496695da3850e4a5d807de
parent 45a071221813a1cd2d12fdda4869b1afbdfed581

Merge "Enable clipboard auto clear by default" into tm-dev am: 45a0712218

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16944733

Change-Id: I6412026f85282f157d40a098a2148a7726556a79

services/core/java/com/android/server/clipboard/ClipboardService.java

diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index eb2f80b..9f46bd6 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -389,7 +389,7 @@
             final long oldIdentity = Binder.clearCallingIdentity();
             try {
                 if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_CLIPBOARD,
-                        PROPERTY_AUTO_CLEAR_ENABLED, false)) {
+                        PROPERTY_AUTO_CLEAR_ENABLED, true)) {
                     mClipboardClearHandler.removeEqualMessages(ClipboardClearHandler.MSG_CLEAR,
                             userId);
                     Message clearMessage = Message.obtain(mClipboardClearHandler,