From 5eb57dc7141c319a1df46f4c1d4ba447afc8f3da Mon Sep 17 00:00:00 2001
From: Vadim Caen <caen@google.com>
Date: Wed, 25 May 2022 15:55:35 +0200
Subject: [PATCH] Disable debug logging

Bug: 227173606
Test: N/A
Change-Id: Ia03f7b6e5d9dfb6e247fab4526d6293b3600d398
---
 core/java/android/window/OnBackInvokedDispatcher.java       | 3 +--
 core/java/android/window/WindowOnBackInvokedDispatcher.java | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/core/java/android/window/OnBackInvokedDispatcher.java b/core/java/android/window/OnBackInvokedDispatcher.java
index 3539049af2197..bccee9215c2da 100644
--- a/core/java/android/window/OnBackInvokedDispatcher.java
+++ b/core/java/android/window/OnBackInvokedDispatcher.java
@@ -20,7 +20,6 @@ import android.annotation.IntDef;
 import android.annotation.IntRange;
 import android.annotation.NonNull;
 import android.annotation.SuppressLint;
-import android.os.Build;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -38,7 +37,7 @@ public interface OnBackInvokedDispatcher {
     String TAG = "OnBackInvokedDispatcher";
 
     /** @hide */
-    boolean DEBUG = Build.isDebuggable();
+    boolean DEBUG = false;
 
     /** @hide */
     @IntDef({
diff --git a/core/java/android/window/WindowOnBackInvokedDispatcher.java b/core/java/android/window/WindowOnBackInvokedDispatcher.java
index 985e2b9630aca..1d0bc5a6f0bae 100644
--- a/core/java/android/window/WindowOnBackInvokedDispatcher.java
+++ b/core/java/android/window/WindowOnBackInvokedDispatcher.java
@@ -19,7 +19,6 @@ package android.window;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.content.Context;
-import android.os.Debug;
 import android.os.Handler;
 import android.os.RemoteException;
 import android.os.SystemProperties;
@@ -186,10 +185,6 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher {
                 callbackInfo = new OnBackInvokedCallbackInfo(iCallback, priority);
             }
             mWindowSession.setOnBackInvokedCallbackInfo(mWindow, callbackInfo);
-            if (DEBUG && callback == null) {
-                Log.d(TAG, TextUtils.formatSimple("setTopOnBackInvokedCallback(null) Callers:%s",
-                        Debug.getCallers(5, "  ")));
-            }
         } catch (RemoteException e) {
             Log.e(TAG, "Failed to set OnBackInvokedCallback to WM. Error: " + e);
         }