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

Merge "Fix NPE when NotificationEntry can't be found for action tap" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-11 20:53:41 +00:00
committed by Android (Google) Code Review
parent 65ea7496c2 e89c3de2d8
commit cc3c259e52
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
View File

@@ -169,7 +169,7 @@ public class NotificationRemoteInputManager implements Dumpable {
Pair<Intent, ActivityOptions> options = response.getLaunchOptions(view);
mLogger.logStartingIntentWithDefaultHandler(entry, pendingIntent);
boolean started = RemoteViews.startPendingIntent(view, pendingIntent, options);
if (started) releaseNotificationIfKeptForRemoteInputHistory(entry.getKey());
if (started) releaseNotificationIfKeptForRemoteInputHistory(entry);
return started;
});
}
@@ -608,7 +608,11 @@ public class NotificationRemoteInputManager implements Dumpable {
* (after unlock, if applicable), and will then wait a short time to allow the app to update the
* notification in response to the action.
*/
private void releaseNotificationIfKeptForRemoteInputHistory(String key) {
private void releaseNotificationIfKeptForRemoteInputHistory(NotificationEntry entry) {
if (entry == null) {
return;
}
final String key = entry.getKey();
if (isNotificationKeptForRemoteInputHistory(key)) {
mMainHandler.postDelayed(() -> {
if (isNotificationKeptForRemoteInputHistory(key)) {