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

Merge "Log result of notification pending intent launch" into tm-dev

Browse Source
This commit is contained in:
Steve Elliott
2022-04-05 21:02:51 +00:00
committed by Android (Google) Code Review
parent d7b7a5a2e9 8ca7b557bb
commit b6e4780466
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java
View File

@@ -489,7 +489,7 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte
ExpandableNotificationRow row,
boolean animate,
boolean isActivityIntent) {
mLogger.logStartNotificationIntent(entry.getKey(), intent);
mLogger.logStartNotificationIntent(entry.getKey());
try {
Runnable onFinishAnimationCallback = animate
? () -> mLaunchEventsEmitter.notifyFinishLaunchNotifActivity(entry)
@@ -513,8 +513,10 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte
mKeyguardStateController.isShowing(),
eventTime)
: getActivityOptions(mCentralSurfaces.getDisplayId(), adapter);
return intent.sendAndReturnResult(mContext, 0, fillInIntent, null,
int result = intent.sendAndReturnResult(mContext, 0, fillInIntent, null,
null, null, options);
mLogger.logSendPendingIntent(entry.getKey(), intent, result);
return result;
});
} catch (PendingIntent.CanceledException e) {
// the stack trace isn't very helpful here.

19
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterLogger.kt
View File

@@ -32,7 +32,7 @@ class StatusBarNotificationActivityStarterLogger @Inject constructor(
buffer.log(TAG, DEBUG, {
str1 = key
}, {
"(1/4) onNotificationClicked: $str1"
"(1/5) onNotificationClicked: $str1"
})
}
@@ -40,7 +40,7 @@ class StatusBarNotificationActivityStarterLogger @Inject constructor(
buffer.log(TAG, DEBUG, {
str1 = key
}, {
"(2/4) handleNotificationClickAfterKeyguardDismissed: $str1"
"(2/5) handleNotificationClickAfterKeyguardDismissed: $str1"
})
}
@@ -48,16 +48,25 @@ class StatusBarNotificationActivityStarterLogger @Inject constructor(
buffer.log(TAG, DEBUG, {
str1 = key
}, {
"(3/4) handleNotificationClickAfterPanelCollapsed: $str1"
"(3/5) handleNotificationClickAfterPanelCollapsed: $str1"
})
}
fun logStartNotificationIntent(key: String, pendingIntent: PendingIntent) {
fun logStartNotificationIntent(key: String) {
buffer.log(TAG, INFO, {
str1 = key
}, {
"(4/5) startNotificationIntent: $str1"
})
}
fun logSendPendingIntent(key: String, pendingIntent: PendingIntent, result: Int) {
buffer.log(TAG, INFO, {
str1 = key
str2 = pendingIntent.intent.toString()
int1 = result
}, {
"(4/4) Starting $str2 for notification $str1"
"(5/5) Started intent $str2 for notification $str1 with result code $int1"
})
}