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

Commit 6fc06d17 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

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

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

Change-Id: I8585a257fef5f9b38bee05ace325f087ff65bace
parents 61d1334b 8a00e334

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java

+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);

                }

            }

        });