Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e91c1ebe authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Add null check for quick share intent" into tm-qpr-dev am: 81a1b8bb am: 3e7d7e8b 

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



Change-Id: I66f92549613bd1e5e99456607fe32871bbef0e99
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59cc67eb 3e7d7e8b

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java

+17 −6
Original line number Diff line number Diff line
@@ -825,12 +825,23 @@ public class ScreenshotView extends FrameLayout implements 
            }

        });

        if (mQuickShareChip != null) {

            if (imageData.quickShareAction != null) {

                mQuickShareChip.setPendingIntent(imageData.quickShareAction.actionIntent,

                        () -> {

                            mUiEventLogger.log(

                                ScreenshotEvent.SCREENSHOT_SMART_ACTION_TAPPED, 0, mPackageName);

                                    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) {