Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d153782 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disable debug logging" into tm-dev am: 36398057 am: 73df4359 am:... 

Merge "Disable debug logging" into tm-dev am: 36398057 am: 73df4359 am: 7b87da43 am: e83c438c

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



Change-Id: Ic6f42fa1cbdf96e6c15a7785d2352fad67b43acb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62fc2cc5 e83c438c

core/java/android/window/OnBackInvokedDispatcher.java

+1 −2
Original line number Diff line number Diff line
@@ -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({

core/java/android/window/WindowOnBackInvokedDispatcher.java

+0 −5
Original line number Diff line number Diff line
@@ -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);

        }