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 am: 40ab17b0ee

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

Change-Id: Ib7acce47bc88c5e0484f07257618a13f53a517f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pinyao Ting
2022-09-07 17:07:18 +00:00
committed by Automerger Merge Worker
parent 9956179212 40ab17b0ee
commit f19305b7c8
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 mNonPersistentUsersLock = new Object();
private final Object mWtfLock = new Object();
private static List<ResolveInfo> EMPTY_RESOLVE_INFO = new ArrayList<>(0);
@@ -444,10 +445,10 @@ public class ShortcutService extends IShortcutService.Stub {
@interface ShortcutOperation {
}
@GuardedBy("mLock")
@GuardedBy("mWtfLock")
private int mWtfCount = 0;
@GuardedBy("mLock")
@GuardedBy("mWtfLock")
private Exception mLastWtfStacktrace;
@GuardedBy("mLock")
@@ -4727,13 +4728,15 @@ public class ShortcutService extends IShortcutService.Stub {
mStatLogger.dump(pw, " ");
pw.println();
pw.print(" #Failures: ");
pw.println(mWtfCount);
synchronized (mWtfLock) {
pw.println();
pw.print(" #Failures: ");
pw.println(mWtfCount);
if (mLastWtfStacktrace != null) {
pw.print(" Last failure stack trace: ");
pw.println(Log.getStackTraceString(mLastWtfStacktrace));
if (mLastWtfStacktrace != null) {
pw.print(" Last failure stack trace: ");
pw.println(Log.getStackTraceString(mLastWtfStacktrace));
}
}
pw.println();
@@ -5148,7 +5151,7 @@ public class ShortcutService extends IShortcutService.Stub {
if (e == null) {
e = new RuntimeException("Stacktrace");
}
synchronized (mLock) {
synchronized (mWtfLock) {
mWtfCount++;
mLastWtfStacktrace = new Exception("Last failure was logged here:");
}