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

Commit 8010632c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "transcoding: fix nullptr in TranscodingSessionController test"

parents 271e4dba f47a357d
Loading
Loading
Loading
Loading
+13 −2
Original line number Diff line number Diff line
@@ -79,6 +79,15 @@ public:
    std::weak_ptr<UidPolicyCallbackInterface> mUidPolicyCallback;
};

class TestResourcePolicy : public ResourcePolicyInterface {
public:
    TestResourcePolicy() = default;
    virtual ~TestResourcePolicy() = default;

    void setCallback(const std::shared_ptr<ResourcePolicyCallbackInterface>& /*cb*/) override {}
    void setPidResourceLost(pid_t /*pid*/) override {}
};

class TestTranscoder : public TranscoderInterface {
public:
    TestTranscoder() : mLastError(TranscodingErrorCode::kUnknown) {}
@@ -216,8 +225,9 @@ public:
        ALOGI("TranscodingSessionControllerTest set up");
        mTranscoder.reset(new TestTranscoder());
        mUidPolicy.reset(new TestUidPolicy());
        mController.reset(new TranscodingSessionController(mTranscoder, mUidPolicy,
                                                           nullptr /*resourcePolicy*/));
        mResourcePolicy.reset(new TestResourcePolicy());
        mController.reset(
                new TranscodingSessionController(mTranscoder, mUidPolicy, mResourcePolicy));
        mUidPolicy->setCallback(mController);

        // Set priority only, ignore other fields for now.
@@ -239,6 +249,7 @@ public:

    std::shared_ptr<TestTranscoder> mTranscoder;
    std::shared_ptr<TestUidPolicy> mUidPolicy;
    std::shared_ptr<TestResourcePolicy> mResourcePolicy;
    std::shared_ptr<TranscodingSessionController> mController;
    TranscodingRequestParcel mOfflineRequest;
    TranscodingRequestParcel mRealtimeRequest;
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ fi
mm

# Push the files onto the device.
. $ANDROID_BUILD_TOP/frameworks/av/media/libmediatranscoding/tests/assets/push_assets.sh
. $ANDROID_BUILD_TOP/frameworks/av/media/libmediatranscoding/tests/push_assets.sh

echo "[==========] installing test apps"
adb root