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

Commit dd3dd52b authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-1553275-Bug139327211_V5-QZELUAZXGW" into sc-dev am: eb1c29d6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14719886

Change-Id: I49d49cfdd67994234d9eacf338d6275e796df91a
parents c73e098a eb1c29d6
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -614,12 +614,6 @@ void IPCThreadState::processPostWriteDerefs()
    mPostWriteStrongDerefs.clear();
}

void IPCThreadState::createTransactionReference(RefBase* ref)
{
    ref->incStrong(mProcess.get());
    mPostWriteStrongDerefs.push(ref);
}

void IPCThreadState::joinThreadPool(bool isMain)
{
    LOG_THREADPOOL("**** THREAD %p (PID %d) IS JOINING THE THREAD POOL\n", (void*)pthread_self(), getpid());
+0 −6
Original line number Diff line number Diff line
@@ -162,12 +162,6 @@ public:
            // This constant needs to be kept in sync with Binder.UNSET_WORKSOURCE from the Java
            // side.
            static const int32_t kUnsetWorkSource = -1;

            // Create a temp reference until commands in queue flushed to driver
            // Internal only.
            // @internal
            void                 createTransactionReference(RefBase* ref);

private:
                                IPCThreadState();
                                ~IPCThreadState();
+0 −43
Original line number Diff line number Diff line
/*
 * Copyright (C) 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.
 */

#pragma once


#include <binder/Parcel.h>
#include <utils/RefBase.h>

// ---------------------------------------------------------------------------
namespace android {

/**
 * internal use only
 * @internal
 */
class ParcelRef : public Parcel, public RefBase
{
public:
    static sp<ParcelRef> create() {
        return new ParcelRef();
    }

private:
    ParcelRef() = default;
};

} // namespace android

// ---------------------------------------------------------------------------
 No newline at end of file