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

Merge "Do not synchronize on IPCs and callbacks"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-01 22:25:24 +00:00
committed by Android (Google) Code Review
parent 7469bbce8e 175fc99cca
commit 85ba182acb
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
packages/SystemUI/src/com/android/systemui/DejankUtils.java
View File

@@ -61,19 +61,21 @@ public class DejankUtils {
|| !isMainThread() || sTemporarilyIgnoreStrictMode) {
return null;
}
}
try {
String description = binder.getInterfaceDescriptor();
try {
String description = binder.getInterfaceDescriptor();
synchronized (sLock) {
if (sWhitelistedFrameworkClasses.contains(description)) {
return null;
}
} catch (RemoteException e) {
e.printStackTrace();
}
StrictMode.noteSlowCall("IPC detected on critical path: " + sBlockingIpcs.peek());
return null;
} catch (RemoteException e) {
e.printStackTrace();
}
StrictMode.noteSlowCall("IPC detected on critical path: " + sBlockingIpcs.peek());
return null;
}
@Override
@@ -126,9 +128,11 @@ public class DejankUtils {
if (STRICT_MODE_ENABLED && sBlockingIpcs.empty()) {
synchronized (sLock) {
sBlockingIpcs.push("detectBlockingIpcs");
try {
runnable.run();
} finally {
}
try {
runnable.run();
} finally {
synchronized (sLock) {
sBlockingIpcs.pop();
}
}
@@ -177,9 +181,11 @@ public class DejankUtils {
if (STRICT_MODE_ENABLED && !sTemporarilyIgnoreStrictMode) {
synchronized (sLock) {
sTemporarilyIgnoreStrictMode = true;
try {
runnable.run();
} finally {
}
try {
runnable.run();
} finally {
synchronized (sLock) {
sTemporarilyIgnoreStrictMode = false;
}
}
@@ -196,14 +202,16 @@ public class DejankUtils {
if (STRICT_MODE_ENABLED && !sTemporarilyIgnoreStrictMode) {
synchronized (sLock) {
sTemporarilyIgnoreStrictMode = true;
final T val;
try {
val = supplier.get();
} finally {
}
final T val;
try {
val = supplier.get();
} finally {
synchronized (sLock) {
sTemporarilyIgnoreStrictMode = false;
}
return val;
}
return val;
} else {
return supplier.get();
}