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

Merge "Fix issue with callback not being made on the sysui main thread" into sc-dev am: e5bb44a832

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

Change-Id: Icdd6f4749f254dfa66dc541c20f2591527c19c34
This commit is contained in:
Winson Chung
2021-04-14 19:54:09 +00:00
committed by Automerger Merge Worker
parent b579dfcfc2 e5bb44a832
commit ddd3f7e10c
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java
View File

@@ -739,14 +739,11 @@ public class BubbleController {
return (isSummary && isSuppressedSummary) || isSuppressedBubble;
}
private void removeSuppressedSummaryIfNecessary(String groupKey, Consumer<String> callback,
Executor callbackExecutor) {
private void removeSuppressedSummaryIfNecessary(String groupKey, Consumer<String> callback) {
if (mBubbleData.isSummarySuppressed(groupKey)) {
mBubbleData.removeSuppressedSummary(groupKey);
if (callback != null) {
callbackExecutor.execute(() -> {
callback.accept(mBubbleData.getSummaryKey(groupKey));
});
callback.accept(mBubbleData.getSummaryKey(groupKey));
}
}
}
@@ -1298,8 +1295,10 @@ public class BubbleController {
public void removeSuppressedSummaryIfNecessary(String groupKey, Consumer<String> callback,
Executor callbackExecutor) {
mMainExecutor.execute(() -> {
BubbleController.this.removeSuppressedSummaryIfNecessary(groupKey, callback,
callbackExecutor);
Consumer<String> cb = callback != null
? (key) -> callbackExecutor.execute(() -> callback.accept(key))
: null;
BubbleController.this.removeSuppressedSummaryIfNecessary(groupKey, cb);
});
}
@@ -1340,10 +1339,13 @@ public class BubbleController {
@Override
public boolean handleDismissalInterception(BubbleEntry entry,
@Nullable List<BubbleEntry> children, IntConsumer removeCallback) {
@Nullable List<BubbleEntry> children, IntConsumer removeCallback,
Executor callbackExecutor) {
IntConsumer cb = removeCallback != null
? (index) -> callbackExecutor.execute(() -> removeCallback.accept(index))
: null;
return mMainExecutor.executeBlockingForResult(() -> {
return BubbleController.this.handleDismissalInterception(entry, children,
removeCallback);
return BubbleController.this.handleDismissalInterception(entry, children, cb);
}, Boolean.class);
}

2
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java
View File

@@ -140,7 +140,7 @@ public interface Bubbles {
* @return true if we want to intercept the dismissal of the entry, else false.
*/
boolean handleDismissalInterception(BubbleEntry entry, @Nullable List<BubbleEntry> children,
IntConsumer removeCallback);
IntConsumer removeCallback, Executor callbackExecutor);
/** Set the proxy to commnuicate with SysUi side components. */
void setSysuiProxy(SysuiProxy proxy);

2
packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java
View File

@@ -633,7 +633,7 @@ public class BubblesManager implements Dumpable {
} else {
mNotificationGroupManager.onEntryRemoved(entry);
}
});
}, mSysuiMainExecutor);
}
/**