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

Commit 86a4de3f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Fix NPE when logging already removed pip activity am: be00a83a am: b4d914cf 

Change-Id: I01077514d67478f45cded7577e90ea54034678bd
parents e76d52d5 b4d914cf

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

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class PipAppOpsListener { 
            try {

                // Dismiss the PiP once the user disables the app ops setting for that package

                final Pair<ComponentName, Integer> topPipActivityInfo =

                        PipUtils.getTopPinnedActivity(mContext, mActivityManager);

                        PipUtils.getTopPipActivity(mContext, mActivityManager);

                if (topPipActivityInfo.first != null) {

                    final ApplicationInfo appInfo = mContext.getPackageManager()

                            .getApplicationInfoAsUser(packageName, 0, topPipActivityInfo.second);

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

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio 


        @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();

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

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ public class PipMediaController { 
     */

    private void resolveActiveMediaController(List<MediaController> controllers) {

        if (controllers != null) {

            final ComponentName topActivity = PipUtils.getTopPinnedActivity(mContext,

            final ComponentName topActivity = PipUtils.getTopPipActivity(mContext,

                    mActivityManager).first;

            if (topActivity != null) {

                for (int i = 0; i < controllers.size(); i++) {

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

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ public class PipMenuActivity extends Activity { 


    private void showSettings() {

        final Pair<ComponentName, Integer> topPipActivityInfo =

                PipUtils.getTopPinnedActivity(this, ActivityManager.getService());

                PipUtils.getTopPipActivity(this, ActivityManager.getService());

        if (topPipActivityInfo.first != null) {

            final UserHandle user = UserHandle.of(topPipActivityInfo.second);

            final Intent settingsIntent = new Intent(ACTION_PICTURE_IN_PICTURE_SETTINGS,

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

+7 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.graphics.Rect; 
import android.os.Handler;

import android.os.RemoteException;

import android.util.Log;

import android.util.Pair;

import android.util.Size;

import android.view.IPinnedStackController;

import android.view.InputEvent;
@@ -148,8 +149,11 @@ public class PipTouchHandler { 


        @Override

        public void onPipDismiss() {

            MetricsLoggerWrapper.logPictureInPictureDismissByTap(mContext,

                    PipUtils.getTopPinnedActivity(mContext, mActivityManager));

            Pair<ComponentName, Integer> topPipActivity = PipUtils.getTopPipActivity(mContext,

                    mActivityManager);

            if (topPipActivity.first != null) {

                MetricsLoggerWrapper.logPictureInPictureDismissByTap(mContext, topPipActivity);

            }

            mMotionHelper.dismissPip();

        }
@@ -653,7 +657,7 @@ public class PipTouchHandler { 
                // Check if the user dragged or flung the PiP offscreen to dismiss it

                if (mMotionHelper.shouldDismissPip() || isFlingToBot) {

                    MetricsLoggerWrapper.logPictureInPictureDismissByDrag(mContext,

                            PipUtils.getTopPinnedActivity(mContext, mActivityManager));

                            PipUtils.getTopPipActivity(mContext, mActivityManager));

                    mMotionHelper.animateDismiss(

                            vel.x, vel.y,

                            PipTouchHandler.this::updateDismissFraction /* updateAction */);