commit be00a83ae2fff92adaa368ec29125db0b545f6dc
author Winson Chung <winsonc@google.com> Tue Mar 10 11:08:35 2020 -0700
committer Winson Chung <winsonc@google.com> Thu Mar 12 17:22:04 2020 +0000
tree 2c527dc356d15e620dd00d11039a6194ebff8eca
parent 3c706cfcac6b41852aa43885efd43f50c44b344d

Fix NPE when logging already removed pip activity

Bug: 148943800
Test: Manual

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

diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java
index 1fdf92e..32e9a03 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java
@@ -115,7 +115,7 @@
 
         @Override
         public void onActivityUnpinned() {
-            final Pair<ComponentName, Integer> topPipActivityInfo = PipUtils.getTopPinnedActivity(
+            final Pair<ComponentName, Integer> topPipActivityInfo = PipUtils.getTopPipActivity(
                     mContext, mActivityManager);
             final ComponentName topActivity = topPipActivityInfo.first;
             mMenuController.onActivityUnpinned();