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 am: 81a1b8bb85

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

Change-Id: Id696d0aab7a725c5d23f98f3693ea0b055500a6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Miranda Kephart
2022-11-30 18:17:34 +00:00
committed by Automerger Merge Worker
parent c29fbf3185 81a1b8bb85
commit 3e7d7e8b71
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -825,12 +825,23 @@ public class ScreenshotView extends FrameLayout implements
}
});
if (mQuickShareChip != null) {
mQuickShareChip.setPendingIntent(imageData.quickShareAction.actionIntent,
() -> {
mUiEventLogger.log(
ScreenshotEvent.SCREENSHOT_SMART_ACTION_TAPPED, 0, mPackageName);
animateDismissal();
});
if (imageData.quickShareAction != null) {
mQuickShareChip.setPendingIntent(imageData.quickShareAction.actionIntent,
() -> {
mUiEventLogger.log(
ScreenshotEvent.SCREENSHOT_SMART_ACTION_TAPPED, 0,
mPackageName);
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) {