PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Android 12.0/12.1/13 crash

Browse Source
This commit is contained in:
Pun Butrach
2026-01-10 20:50:01 +07:00
parent edfd0baad6
commit a80a2a9c8d
7 changed files with 81 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
systemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java
+12 -11
View File
@@ -33,7 +33,7 @@ public final class InteractionJankMonitorWrapper {
*/
public static void begin(View v, @Cuj.CujType int cujType) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return;
InteractionJankMonitor.getInstance().begin(v, cujType);
// InteractionJankMonitor.getInstance().begin(v, cujType);
}
/**
@@ -48,7 +48,7 @@ public final class InteractionJankMonitorWrapper {
Configuration.Builder builder =
Configuration.Builder.withView(cujType, v)
.setTimeout(timeout);
InteractionJankMonitor.getInstance().begin(builder);
// InteractionJankMonitor.getInstance().begin(builder);
}
/**
@@ -60,12 +60,12 @@ public final class InteractionJankMonitorWrapper {
*/
public static void begin(View v, @Cuj.CujType int cujType, String tag) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return;
Configuration.Builder builder =
Configuration.Builder.withView(cujType, v);
if (!TextUtils.isEmpty(tag)) {
builder.setTag(tag);
}
InteractionJankMonitor.getInstance().begin(builder);
// Configuration.Builder builder =
// Configuration.Builder.withView(cujType, v);
// if (!TextUtils.isEmpty(tag)) {
// builder.setTag(tag);
// }
// InteractionJankMonitor.getInstance().begin(builder);
}
/**
@@ -75,7 +75,7 @@ public final class InteractionJankMonitorWrapper {
*/
public static void end(@Cuj.CujType int cujType) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return;
InteractionJankMonitor.getInstance().end(cujType);
// InteractionJankMonitor.getInstance().end(cujType);
}
/**
@@ -83,12 +83,13 @@ public final class InteractionJankMonitorWrapper {
*/
public static void cancel(@Cuj.CujType int cujType) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return;
InteractionJankMonitor.getInstance().cancel(cujType);
// InteractionJankMonitor.getInstance().cancel(cujType);
}
/** Return true if currently instrumenting a trace session. */
public static boolean isInstrumenting(@Cuj.CujType int cujType) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return false;
return InteractionJankMonitor.getInstance().isInstrumenting(cujType);
// return InteractionJankMonitor.getInstance().isInstrumenting(cujType);
return false;
}
}