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

Commit 149165e9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Merge "Add null check for NPE before logging" into rvc-dev am:...

Merge "Merge "Merge "Add null check for NPE before logging" into rvc-dev am: 5fe7d558 am: bcf30c63" into rvc-d1-dev-plus-aosp am: 8a00e334" into rvc-qpr-dev-plus-aosp am: 244ba48f

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

Change-Id: I7f9a0df84463ffb0f51084bc90ebe5a5d82aa121
parents 76aa86a5 244ba48f
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -303,8 +303,11 @@ public class PipTouchHandler {
                    hideDismissTarget();
                });

                MetricsLoggerWrapper.logPictureInPictureDismissByDrag(mContext,
                        PipUtils.getTopPipActivity(mContext, mActivityManager));
                Pair<ComponentName, Integer> topPipActivity = PipUtils.getTopPipActivity(mContext,
                        mActivityManager);
                if (topPipActivity.first != null) {
                    MetricsLoggerWrapper.logPictureInPictureDismissByDrag(mContext, topPipActivity);
                }
            }
        });