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

Commit 4a474e8e authored by Ady Abraham's avatar Ady Abraham
Browse files

SurfaceFlinger: fix a crash with RefreshRateOverlay 

 - Fix a nullptr deference in createLayer
 - Add a test for RefreshRateOverlay

Test: adb shell /data/nativetest64/SurfaceFlinger_test/SurfaceFlinger_test
Bug: 169867983
Change-Id: I496aaeceaa86b55f806ddc921fc5b050417725b7
parent aa4bbda7

TEST_MAPPING

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ 
        },

        {

          "include-filter": "*RelativeZTest.*"

        },

        {

          "include-filter": "*RefreshRateOverlayTest.*"

        }

      ]

    },

services/surfaceflinger/SurfaceFlinger.cpp

+3 −1
Original line number Diff line number Diff line
@@ -3942,7 +3942,9 @@ status_t SurfaceFlinger::createLayer(const String8& name, const sp<Client>& clie 
    mInterceptor->saveSurfaceCreation(layer);



    setTransactionFlags(eTransactionNeeded);

    if (outId) {

        *outId = layer->sequence;

    }

    return result;

}

services/surfaceflinger/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ cc_test { 
        "LayerUpdate_test.cpp",

        "MirrorLayer_test.cpp",

        "MultiDisplayLayerBounds_test.cpp",

        "RefreshRateOverlay_test.cpp",

        "RelativeZ_test.cpp",

        "ScreenCapture_test.cpp",

        "SetFrameRate_test.cpp",

services/surfaceflinger/tests/RefreshRateOverlay_test.cpp

0 → 100644
+95 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <thread>



#include <gtest/gtest.h>



#include <gui/SurfaceComposerClient.h>

#include <private/gui/ComposerService.h>



static constexpr int kRefreshRateOverlayCode = 1034;

static constexpr int kRefreshRateOverlayEnable = 1;

static constexpr int kRefreshRateOverlayDisable = 0;

static constexpr int kRefreshRateOverlayQuery = 2;



// These values must match the ones we used for developer options in

// com.android.settings.development.ShowRefreshRatePreferenceController

static_assert(kRefreshRateOverlayCode == 1034);

static_assert(kRefreshRateOverlayEnable == 1);

static_assert(kRefreshRateOverlayDisable == 0);

static_assert(kRefreshRateOverlayQuery == 2);



namespace android {



namespace {

void sendCommandToSf(int command, Parcel& reply) {

    sp<ISurfaceComposer> sf(ComposerService::getComposerService());

    Parcel request;

    request.writeInterfaceToken(String16("android.ui.ISurfaceComposer"));

    request.writeInt32(command);

    ASSERT_EQ(NO_ERROR,

              IInterface::asBinder(sf)->transact(kRefreshRateOverlayCode, request, &reply));

}



bool isOverlayEnabled() {

    Parcel reply;

    sendCommandToSf(kRefreshRateOverlayQuery, reply);

    return reply.readBool();

}



void waitForOverlay(bool enabled) {

    static constexpr auto kTimeout = std::chrono::nanoseconds(1s);

    static constexpr auto kIterations = 10;

    for (int i = 0; i < kIterations; i++) {

        if (enabled == isOverlayEnabled()) {

            return;

        }

        std::this_thread::sleep_for(kTimeout / kIterations);

    }

}



void toggleOverlay(bool enabled) {

    if (enabled == isOverlayEnabled()) {

        return;

    }



    Parcel reply;

    const auto command = enabled ? kRefreshRateOverlayEnable : kRefreshRateOverlayDisable;

    sendCommandToSf(command, reply);

    waitForOverlay(enabled);

    ASSERT_EQ(enabled, isOverlayEnabled());

}



} // namespace



TEST(RefreshRateOverlayTest, enableOverlay) {

    toggleOverlay(true);

}



TEST(RefreshRateOverlayTest, disableOverlay) {

    toggleOverlay(false);

}



TEST(RefreshRateOverlayTest, enableAndDisableOverlay) {

    toggleOverlay(true);

    toggleOverlay(false);



    toggleOverlay(true);

    toggleOverlay(false);

}



} // namespace android
 
 No newline at end of file