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

Commit 94d645bf authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12829911 from d0b8504b to 25Q2-release

Change-Id: I6c3ae565228680803295b5c71e1138d46511f047
parents bf2d4a6e d0b8504b
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -615,7 +615,7 @@ std::unique_ptr<KeyCharacterMap> KeyCharacterMap::readFromParcel(Parcel* parcel)
        ALOGE("%s: Null parcel", __func__);
        ALOGE("%s: Null parcel", __func__);
        return nullptr;
        return nullptr;
    }
    }
    std::string loadFileName = parcel->readCString();
    std::string loadFileName = parcel->readString8().c_str();
    std::unique_ptr<KeyCharacterMap> map =
    std::unique_ptr<KeyCharacterMap> map =
            std::make_unique<KeyCharacterMap>(KeyCharacterMap(loadFileName));
            std::make_unique<KeyCharacterMap>(KeyCharacterMap(loadFileName));
    map->mType = static_cast<KeyCharacterMap::KeyboardType>(parcel->readInt32());
    map->mType = static_cast<KeyCharacterMap::KeyboardType>(parcel->readInt32());
@@ -704,7 +704,7 @@ void KeyCharacterMap::writeToParcel(Parcel* parcel) const {
        ALOGE("%s: Null parcel", __func__);
        ALOGE("%s: Null parcel", __func__);
        return;
        return;
    }
    }
    parcel->writeCString(mLoadFileName.c_str());
    parcel->writeString8(String8(mLoadFileName.c_str()));
    parcel->writeInt32(static_cast<int32_t>(mType));
    parcel->writeInt32(static_cast<int32_t>(mType));
    parcel->writeBool(mLayoutOverlayApplied);
    parcel->writeBool(mLayoutOverlayApplied);