From 1e0a390c9da1774bf58fee0b47559722d07a1f93 Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Fri, 12 Jun 2020 01:32:54 +0000 Subject: [PATCH] Revert "Make PipTaskOrganizer protected." This reverts commit 11e808a472b29a32fe03f1a9f28b2e5a0cd81e7a. Reason for revert: Don't need this anymore since PipTaskOrganizer is an injectable. Bug: 158792326 Change-Id: I6e88dd698c03b8f8e6b7aebd96bb869406bcc5ce --- .../SystemUI/src/com/android/systemui/pip/phone/PipManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b714bff15d8a5..9384194ed13f3 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java @@ -81,12 +81,12 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio private InputConsumerController mInputConsumerController; private PipMediaController mMediaController; private PipTouchHandler mTouchHandler; + private PipTaskOrganizer mPipTaskOrganizer; private PipAppOpsListener mAppOpsListener; private IPinnedStackAnimationListener mPinnedStackAnimationRecentsListener; private boolean mIsInFixedRotation; protected PipMenuActivityController mMenuController; - protected PipTaskOrganizer mPipTaskOrganizer; /** * Handler for display rotation changes.