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

Commit 57611581 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Have VirtualDisplayDevice handle Binder death directly."

parents 112a5b62 a3320fe8

services/core/java/com/android/server/display/VirtualDisplayAdapter.java

+5 −7
Original line number Diff line number Diff line
@@ -149,13 +149,7 @@ final class VirtualDisplayAdapter extends DisplayAdapter { 
    }



    private void handleBinderDiedLocked(IBinder appToken) {

        VirtualDisplayDevice device = mVirtualDisplayDevices.remove(appToken);

        if (device != null) {

            Slog.i(TAG, "Virtual display device released because application token died: "

                    + device.mOwnerPackageName);

            device.destroyLocked(false);

            sendDisplayDeviceEventLocked(device, DISPLAY_DEVICE_EVENT_REMOVED);

        }

        mVirtualDisplayDevices.remove(appToken);

    }



    private void handleMediaProjectionStoppedLocked(IBinder appToken) {
@@ -216,6 +210,10 @@ final class VirtualDisplayAdapter extends DisplayAdapter { 
        public void binderDied() {

            synchronized (getSyncRoot()) {

                handleBinderDiedLocked(mAppToken);

                Slog.i(TAG, "Virtual display device released because application token died: "

                    + mOwnerPackageName);

                destroyLocked(false);

                sendDisplayDeviceEventLocked(this, DISPLAY_DEVICE_EVENT_REMOVED);

            }

        }