Merge "Check for null layer handles from clients"

        listenerCallbacks.insert(listener);

        listenerCallbacks.insert(listener);

    }

    }

    sp<Layer> layer(fromHandle(s.surface));

    sp<Layer> layer = nullptr;

    if (s.surface) {

        layer = fromHandle(s.surface);

    } else {

        // The client may provide us a null handle. Treat it as if the layer was removed.

        ALOGW("Attempt to set client state with a null layer handle");

    }

    if (layer == nullptr) {

    if (layer == nullptr) {

        for (auto& [listener, callbackIds] : s.listeners) {

        for (auto& [listener, callbackIds] : s.listeners) {

            mTransactionCompletedThread.registerUnpresentedCallbackHandle(

            mTransactionCompletedThread.registerUnpresentedCallbackHandle(