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

Commit 1f77ae87 authored by Ryan Prichard's avatar Ryan Prichard
Browse files

Remove unused cutils/atomic.h includes, add "std" 

Add a missing "std::" prefix to memory_order_* enumerators.

cutils/atomic.h is deprecated, and these files don't use any of the
header's identifiers.

Bug: 147765083
Test: m MODULES-IN-frameworks-base
Flag: EXEMPT refactor
Change-Id: I9e38624a134676cb18d443ae704bbfe37a238b24
parent b6fe53c5

cmds/bootanimation/BootAnimation.cpp

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <signal.h>

#include <time.h>



#include <cutils/atomic.h>

#include <cutils/properties.h>



#include <android/imagedecoder.h>

core/jni/android_os_Parcel.cpp

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <binder/IServiceManager.h>

#include <binder/Parcel.h>

#include <binder/ProcessState.h>

#include <cutils/atomic.h>

#include <fcntl.h>

#include <nativehelper/JNIPlatformHelp.h>

#include <nativehelper/ScopedLocalRef.h>

core/jni/android_util_Binder.cpp

+2 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <binder/ProcessState.h>

#include <binder/Stability.h>

#include <binderthreadstate/CallerUtils.h>

#include <cutils/atomic.h>

#include <fcntl.h>

#include <inttypes.h>

#include <log/log.h>
@@ -180,7 +179,7 @@ static void gcIfManyNewRefs(JNIEnv* env) 
{

    uint32_t totalRefs = gNumLocalRefsCreated.load(std::memory_order_relaxed)

            + gNumDeathRefsCreated.load(std::memory_order_relaxed);

    uint32_t collectedAtRefs = gCollectedAtRefs.load(memory_order_relaxed);

    uint32_t collectedAtRefs = gCollectedAtRefs.load(std::memory_order_relaxed);

    // A bound on the number of threads that can have incremented gNum...RefsCreated before the

    // following check is executed. Effectively a bound on #threads. Almost any value will do.

    static constexpr uint32_t MAX_RACING = 100000;
@@ -360,7 +359,7 @@ protected: 
    virtual ~JavaBBinder()

    {

        ALOGV("Destroying JavaBBinder %p\n", this);

        gNumLocalRefsDeleted.fetch_add(1, memory_order_relaxed);

        gNumLocalRefsDeleted.fetch_add(1, std::memory_order_relaxed);

        JNIEnv* env = javavm_to_jnienv(mVM);

        env->DeleteGlobalRef(mObject);

    }

libs/androidfw/Asset.cpp

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <androidfw/Util.h>

#include <androidfw/ZipFileRO.h>

#include <androidfw/ZipUtils.h>

#include <cutils/atomic.h>

#include <utils/FileMap.h>

#include <utils/Log.h>

#include <utils/threads.h>