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

Commit d12eb0fc authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Catch RejectedExecutionException for DisplayChanged from WM" into 24D1-dev

parents becfdb07 cc293928
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -23,9 +23,12 @@ import static java.util.Objects.requireNonNull;
import android.annotation.NonNull;
import android.app.ActivityThread;
import android.hardware.display.DisplayManagerGlobal;
import android.util.Log;

import com.android.internal.annotations.VisibleForTesting;

import java.util.concurrent.RejectedExecutionException;

/**
 * Singleton controller to manage listeners to individual {@link ClientTransaction}.
 *
@@ -33,6 +36,8 @@ import com.android.internal.annotations.VisibleForTesting;
 */
public class ClientTransactionListenerController {

    private static final String TAG = "ClientTransactionListenerController";

    private static ClientTransactionListenerController sController;

    private final DisplayManagerGlobal mDisplayManager;
@@ -73,6 +78,10 @@ public class ClientTransactionListenerController {
            // Not enable for system server.
            return;
        }
        try {
            mDisplayManager.handleDisplayChangeFromWindowManager(displayId);
        } catch (RejectedExecutionException e) {
            Log.w(TAG, "Failed to notify DisplayListener because the Handler is shutting down");
        }
    }
}