Merge "Remove logging present in an ANR stack trace" into udc-qpr-dev am: 7977cadcef

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

Change-Id: I1449adc8d174b84941aad419c4f6198b5be15ce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-11 00:12:25 +00:00
committed by Automerger Merge Worker
2 changed files with 1 additions and 12 deletions

View File

@@ -480,7 +480,6 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
private void applyWindowLayoutParams() { private void applyWindowLayoutParams() {
if (mDeferWindowLayoutParams == 0 && mLp != null && mLp.copyFrom(mLpChanged) != 0) { if (mDeferWindowLayoutParams == 0 && mLp != null && mLp.copyFrom(mLpChanged) != 0) {
mLogger.logApplyingWindowLayoutParams(mLp);
Trace.beginSection("updateViewLayout"); Trace.beginSection("updateViewLayout");
mWindowManager.updateViewLayout(mWindowRootView, mLp); mWindowManager.updateViewLayout(mWindowRootView, mLp);
Trace.endSection(); Trace.endSection();

View File

@@ -16,14 +16,13 @@
package com.android.systemui.shade package com.android.systemui.shade
import android.view.WindowManager
import com.android.systemui.log.dagger.ShadeWindowLog
import com.android.systemui.log.ConstantStringsLogger import com.android.systemui.log.ConstantStringsLogger
import com.android.systemui.log.ConstantStringsLoggerImpl import com.android.systemui.log.ConstantStringsLoggerImpl
import com.android.systemui.log.LogBuffer import com.android.systemui.log.LogBuffer
import com.android.systemui.log.core.LogLevel import com.android.systemui.log.core.LogLevel
import com.android.systemui.log.core.LogLevel.DEBUG import com.android.systemui.log.core.LogLevel.DEBUG
import com.android.systemui.log.core.LogMessage import com.android.systemui.log.core.LogMessage
import com.android.systemui.log.dagger.ShadeWindowLog
import javax.inject.Inject import javax.inject.Inject
private const val TAG = "systemui.shadewindow" private const val TAG = "systemui.shadewindow"
@@ -31,15 +30,6 @@ private const val TAG = "systemui.shadewindow"
class ShadeWindowLogger @Inject constructor(@ShadeWindowLog private val buffer: LogBuffer) : class ShadeWindowLogger @Inject constructor(@ShadeWindowLog private val buffer: LogBuffer) :
ConstantStringsLogger by ConstantStringsLoggerImpl(buffer, TAG) { ConstantStringsLogger by ConstantStringsLoggerImpl(buffer, TAG) {
fun logApplyingWindowLayoutParams(lp: WindowManager.LayoutParams) {
buffer.log(
TAG,
DEBUG,
{ str1 = lp.toString() },
{ "Applying new window layout params: $str1" }
)
}
fun logNewState(state: Any) { fun logNewState(state: Any) {
buffer.log( buffer.log(
TAG, TAG,