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

Merge "Add null check for quick share intent" into tm-qpr-dev

Browse Source
This commit is contained in:
Miranda Kephart
2022-11-30 17:48:03 +00:00
committed by Android (Google) Code Review
parent 6aeb8d9a44 c9bc669d43
commit 81a1b8bb85
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
View File

@@ -825,12 +825,23 @@ public class ScreenshotView extends FrameLayout implements
} }
}); });
if (mQuickShareChip != null) { if (mQuickShareChip != null) {
if (imageData.quickShareAction != null) {
mQuickShareChip.setPendingIntent(imageData.quickShareAction.actionIntent, mQuickShareChip.setPendingIntent(imageData.quickShareAction.actionIntent,
() -> { () -> {
mUiEventLogger.log( mUiEventLogger.log(
ScreenshotEvent.SCREENSHOT_SMART_ACTION_TAPPED, 0, mPackageName); ScreenshotEvent.SCREENSHOT_SMART_ACTION_TAPPED, 0,
mPackageName);
animateDismissal(); animateDismissal();
}); });
} else {
// hide chip and unset pending interaction if necessary, since we don't actually
// have a useable quick share intent
Log.wtf(TAG, "Showed quick share chip, but quick share intent was null");
if (mPendingInteraction == PendingInteraction.QUICK_SHARE) {
mPendingInteraction = null;
}
mQuickShareChip.setVisibility(GONE);
}
} }
if (mPendingInteraction != null) { if (mPendingInteraction != null) {