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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12023266 Change-Id: Iaac293d78bc32093250e5fb3287ab6a355d13950
2020-06-29 17:15:32 +00:00
parent 270af3a9ec 5fe7d558be
commit bcf30c6318
1 changed files with 5 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
@@ -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);
+                }
            }
        });