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

Merge "Fixes an edge case which leads to deadlock in ShortcutService" into tm-qpr-dev

Browse Source
This commit is contained in:
Pinyao Ting
2022-09-07 16:46:21 +00:00
committed by Android (Google) Code Review
parent d76f695c5b 30fed8c21b
commit 40ab17b0ee
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/pm/ShortcutService.java
View File

@@ -280,6 +280,7 @@ public class ShortcutService extends IShortcutService.Stub {
private final Object mLock = new Object(); private final Object mLock = new Object();
private final Object mNonPersistentUsersLock = new Object(); private final Object mNonPersistentUsersLock = new Object();
private final Object mWtfLock = new Object();
private static List<ResolveInfo> EMPTY_RESOLVE_INFO = new ArrayList<>(0); private static List<ResolveInfo> EMPTY_RESOLVE_INFO = new ArrayList<>(0);
@@ -444,10 +445,10 @@ public class ShortcutService extends IShortcutService.Stub {
@interface ShortcutOperation { @interface ShortcutOperation {
} }
@GuardedBy("mLock") @GuardedBy("mWtfLock")
private int mWtfCount = 0; private int mWtfCount = 0;
@GuardedBy("mLock") @GuardedBy("mWtfLock")
private Exception mLastWtfStacktrace; private Exception mLastWtfStacktrace;
@GuardedBy("mLock") @GuardedBy("mLock")
@@ -4727,13 +4728,15 @@ public class ShortcutService extends IShortcutService.Stub {
mStatLogger.dump(pw, " "); mStatLogger.dump(pw, " ");
pw.println(); synchronized (mWtfLock) {
pw.print(" #Failures: "); pw.println();
pw.println(mWtfCount); pw.print(" #Failures: ");
pw.println(mWtfCount);
if (mLastWtfStacktrace != null) { if (mLastWtfStacktrace != null) {
pw.print(" Last failure stack trace: "); pw.print(" Last failure stack trace: ");
pw.println(Log.getStackTraceString(mLastWtfStacktrace)); pw.println(Log.getStackTraceString(mLastWtfStacktrace));
}
} }
pw.println(); pw.println();
@@ -5148,7 +5151,7 @@ public class ShortcutService extends IShortcutService.Stub {
if (e == null) { if (e == null) {
e = new RuntimeException("Stacktrace"); e = new RuntimeException("Stacktrace");
} }
synchronized (mLock) { synchronized (mWtfLock) {
mWtfCount++; mWtfCount++;
mLastWtfStacktrace = new Exception("Last failure was logged here:"); mLastWtfStacktrace = new Exception("Last failure was logged here:");
} }