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

Commit c6ada3b1 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 6a846dd5: am 5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native." 

* commit '6a846dd5':
  Lose HAVE_ANDROID_OS from frameworks/native.
parents 18343a2f 6a846dd5

include/input/Input.h

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ struct AInputDevice { 


namespace android {



#ifdef HAVE_ANDROID_OS

#ifdef __ANDROID__

class Parcel;

#endif
@@ -229,7 +229,7 @@ struct PointerCoords { 
        return getAxisValue(AMOTION_EVENT_AXIS_Y);

    }



#ifdef HAVE_ANDROID_OS

#ifdef __ANDROID__

    status_t readFromParcel(Parcel* parcel);

    status_t writeToParcel(Parcel* parcel) const;

#endif
@@ -567,7 +567,7 @@ public: 
    // Matrix is in row-major form and compatible with SkMatrix.

    void transform(const float matrix[9]);



#ifdef HAVE_ANDROID_OS

#ifdef __ANDROID__

    status_t readFromParcel(Parcel* parcel);

    status_t writeToParcel(Parcel* parcel) const;

#endif

include/input/KeyCharacterMap.h

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include <stdint.h>



#if HAVE_ANDROID_OS

#ifdef __ANDROID__

#include <binder/IBinder.h>

#endif
@@ -124,7 +124,7 @@ public: 
     * the mapping in some way. */

    status_t mapKey(int32_t scanCode, int32_t usageCode, int32_t* outKeyCode) const;



#if HAVE_ANDROID_OS

#ifdef __ANDROID__

    /* Reads a key map from a parcel. */

    static sp<KeyCharacterMap> readFromParcel(Parcel* parcel);

libs/binder/IPCThreadState.cpp

+2 −2
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ status_t IPCThreadState::talkWithDriver(bool doReceive) 
        IF_LOG_COMMANDS() {

            alog << "About to read/write, write size = " << mOut.dataSize() << endl;

        }

#if defined(HAVE_ANDROID_OS)

#if defined(__ANDROID__)

        if (ioctl(mProcess->mDriverFD, BINDER_WRITE_READ, &bwr) >= 0)

            err = NO_ERROR;

        else
@@ -1158,7 +1158,7 @@ void IPCThreadState::threadDestructor(void *st) 
        IPCThreadState* const self = static_cast<IPCThreadState*>(st);

        if (self) {

                self->flushCommands();

#if defined(HAVE_ANDROID_OS)

#if defined(__ANDROID__)

        if (self->mProcess->mDriverFD > 0) {

            ioctl(self->mProcess->mDriverFD, BINDER_THREAD_EXIT, 0);

        }

libs/input/Input.cpp

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <input/Input.h>

#include <input/InputEventLabels.h>



#ifdef HAVE_ANDROID_OS

#ifdef __ANDROID__

#include <binder/Parcel.h>

#endif
@@ -144,7 +144,7 @@ void PointerCoords::applyOffset(float xOffset, float yOffset) { 
    setAxisValue(AMOTION_EVENT_AXIS_Y, getY() + yOffset);

}



#ifdef HAVE_ANDROID_OS

#ifdef __ANDROID__

status_t PointerCoords::readFromParcel(Parcel* parcel) {

    bits = parcel->readInt64();
@@ -420,7 +420,7 @@ void MotionEvent::transform(const float matrix[9]) { 
    }

}



#ifdef HAVE_ANDROID_OS

#ifdef __ANDROID__

status_t MotionEvent::readFromParcel(Parcel* parcel) {

    size_t pointerCount = parcel->readInt32();

    size_t sampleCount = parcel->readInt32();

libs/input/KeyCharacterMap.cpp

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <stdlib.h>

#include <string.h>



#if HAVE_ANDROID_OS

#ifdef __ANDROID__

#include <binder/Parcel.h>

#endif
@@ -557,7 +557,7 @@ void KeyCharacterMap::addLockedMetaKey(Vector<KeyEvent>& outEvents, 
    }

}



#if HAVE_ANDROID_OS

#ifdef __ANDROID__

sp<KeyCharacterMap> KeyCharacterMap::readFromParcel(Parcel* parcel) {

    sp<KeyCharacterMap> map = new KeyCharacterMap();

    map->mType = parcel->readInt32();