Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle the UnsupportedOperationException when register TaskOrganizer" into rvc-dev am: 625280b87c

Browse Source 
Change-Id: I6a8074b4d0b14b0c3ca2386c45a6a1d49d353e4c
This commit is contained in:
Evan Rosky
2020-03-28 00:57:16 +00:00
committed by Automerger Merge Worker
parent 9b23d98733 625280b87c
commit a436bc516e
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,6 @@ import android.util.Pair;
import android.view.DisplayInfo; import android.view.DisplayInfo;
import android.view.IPinnedStackController; import android.view.IPinnedStackController;
import android.window.WindowContainerTransaction; import android.window.WindowContainerTransaction;
import android.window.WindowOrganizer;
import com.android.systemui.Dependency; import com.android.systemui.Dependency;
import com.android.systemui.UiOffloadThread; import com.android.systemui.UiOffloadThread;
@@ -258,7 +257,7 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio
// register the pip input consumer to ensure touch can send to it. // register the pip input consumer to ensure touch can send to it.
mInputConsumerController.registerInputConsumer(); mInputConsumerController.registerInputConsumer();
} }
} catch (RemoteException e) { } catch (RemoteException | UnsupportedOperationException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }

3
packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
View File

@@ -45,7 +45,6 @@ import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.view.DisplayInfo; import android.view.DisplayInfo;
import android.window.WindowOrganizer;
import com.android.systemui.Dependency; import com.android.systemui.Dependency;
import com.android.systemui.R; import com.android.systemui.R;
@@ -296,7 +295,7 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio
try { try {
WindowManagerWrapper.getInstance().addPinnedStackListener(mPinnedStackListener); WindowManagerWrapper.getInstance().addPinnedStackListener(mPinnedStackListener);
TaskOrganizer.registerOrganizer(mPipTaskOrganizer, WINDOWING_MODE_PINNED); TaskOrganizer.registerOrganizer(mPipTaskOrganizer, WINDOWING_MODE_PINNED);
} catch (RemoteException e) { } catch (RemoteException | UnsupportedOperationException e) {
Log.e(TAG, "Failed to register pinned stack listener", e); Log.e(TAG, "Failed to register pinned stack listener", e);
} }