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

Commit 625280b8 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Handle the UnsupportedOperationException when register TaskOrganizer" into rvc-dev

parents 36703fba c90eb8e7

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

+1 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.util.Pair; 
import android.view.DisplayInfo;

import android.view.IPinnedStackController;

import android.window.WindowContainerTransaction;

import android.window.WindowOrganizer;



import com.android.systemui.Dependency;

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.

                mInputConsumerController.registerInputConsumer();

            }

        } catch (RemoteException e) {

        } catch (RemoteException | UnsupportedOperationException e) {

            e.printStackTrace();

        }

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import android.text.TextUtils; 
import android.util.Log;

import android.util.Pair;

import android.view.DisplayInfo;

import android.window.WindowOrganizer;



import com.android.systemui.Dependency;

import com.android.systemui.R;
@@ -296,7 +295,7 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio 
        try {

            WindowManagerWrapper.getInstance().addPinnedStackListener(mPinnedStackListener);

            TaskOrganizer.registerOrganizer(mPipTaskOrganizer, WINDOWING_MODE_PINNED);

        } catch (RemoteException e) {

        } catch (RemoteException | UnsupportedOperationException e) {

            Log.e(TAG, "Failed to register pinned stack listener", e);

        }