Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable debug logging" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-25 22:52:28 +00:00
committed by Android (Google) Code Review
parent c56fb0fdeb 5eb57dc714
commit 3639805700
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/window/OnBackInvokedDispatcher.java
View File

@@ -20,7 +20,6 @@ import android.annotation.IntDef;
import android.annotation.IntRange; import android.annotation.IntRange;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.os.Build;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
@@ -38,7 +37,7 @@ public interface OnBackInvokedDispatcher {
String TAG = "OnBackInvokedDispatcher"; String TAG = "OnBackInvokedDispatcher";
/** @hide */ /** @hide */
boolean DEBUG = Build.isDebuggable(); boolean DEBUG = false;
/** @hide */ /** @hide */
@IntDef({ @IntDef({

5
core/java/android/window/WindowOnBackInvokedDispatcher.java
View File

@@ -19,7 +19,6 @@ package android.window;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.os.Debug;
import android.os.Handler; import android.os.Handler;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.SystemProperties; import android.os.SystemProperties;
@@ -186,10 +185,6 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher {
callbackInfo = new OnBackInvokedCallbackInfo(iCallback, priority); callbackInfo = new OnBackInvokedCallbackInfo(iCallback, priority);
} }
mWindowSession.setOnBackInvokedCallbackInfo(mWindow, callbackInfo); mWindowSession.setOnBackInvokedCallbackInfo(mWindow, callbackInfo);
if (DEBUG && callback == null) {
Log.d(TAG, TextUtils.formatSimple("setTopOnBackInvokedCallback(null) Callers:%s",
Debug.getCallers(5, " ")));
}
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Failed to set OnBackInvokedCallback to WM. Error: " + e); Log.e(TAG, "Failed to set OnBackInvokedCallback to WM. Error: " + e);
} }