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

Commit 32a061e2 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Android (Google) Code Review
Browse files

Merge "Return unique_ptr from readFromParcel" into main

parents 8e185db6 c62948ec

include/input/KeyCharacterMap.h

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ public: 


#ifdef __linux__

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

    static std::shared_ptr<KeyCharacterMap> readFromParcel(Parcel* parcel);

    static std::unique_ptr<KeyCharacterMap> readFromParcel(Parcel* parcel);



    /* Writes a key map to a parcel. */

    void writeToParcel(Parcel* parcel) const;

libs/input/KeyCharacterMap.cpp

+3 −3
Original line number Diff line number Diff line
@@ -613,14 +613,14 @@ void KeyCharacterMap::addLockedMetaKey(Vector<KeyEvent>& outEvents, 
}



#ifdef __linux__

std::shared_ptr<KeyCharacterMap> KeyCharacterMap::readFromParcel(Parcel* parcel) {

std::unique_ptr<KeyCharacterMap> KeyCharacterMap::readFromParcel(Parcel* parcel) {

    if (parcel == nullptr) {

        ALOGE("%s: Null parcel", __func__);

        return nullptr;

    }

    std::string loadFileName = parcel->readCString();

    std::shared_ptr<KeyCharacterMap> map =

            std::shared_ptr<KeyCharacterMap>(new KeyCharacterMap(loadFileName));

    std::unique_ptr<KeyCharacterMap> map =

            std::make_unique<KeyCharacterMap>(KeyCharacterMap(loadFileName));

    map->mType = static_cast<KeyCharacterMap::KeyboardType>(parcel->readInt32());

    map->mLayoutOverlayApplied = parcel->readBool();

    size_t numKeys = parcel->readInt32();