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

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

Merge changes from topic "be-kind-rewind" am: 8678720c 

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

Change-Id: I9c6ddc9b5d08dc19bbc95721c0a951455a5372ab
parents 48eeaa70 8678720c

libs/binder/Status.cpp

+6 −0
Original line number Diff line number Diff line
@@ -211,6 +211,12 @@ status_t Status::writeToParcel(Parcel* parcel) const { 
    return status;

}



status_t Status::writeOverParcel(Parcel* parcel) const {

    parcel->setDataSize(0);

    parcel->setDataPosition(0);

    return writeToParcel(parcel);

}



void Status::setException(int32_t ex, const String8& message) {

    mException = ex;

    mErrorCode = ex == EX_TRANSACTION_FAILED ? FAILED_TRANSACTION : NO_ERROR;

libs/binder/include/binder/Status.h

+4 −0
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ public: 
    status_t readFromParcel(const Parcel& parcel);

    status_t writeToParcel(Parcel* parcel) const;



    // Convenience API to replace a Parcel with a status value, w/o requiring

    // calling multiple APIs (makes generated code smaller).

    status_t writeOverParcel(Parcel* parcel) const;



    // Set one of the pre-defined exception types defined above.

    void setException(int32_t ex, const String8& message);

    // Set a service specific exception with error code.

libs/binder/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ cc_test { 
    srcs: [

        "binderParcelUnitTest.cpp",

        "binderBinderUnitTest.cpp",

        "binderStatusUnitTest.cpp",

    ],

    shared_libs: [

        "libbinder",

libs/binder/tests/binderStatusUnitTest.cpp

0 → 100644
+35 −0
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.

 */



#include <binder/Parcel.h>

#include <binder/Status.h>

#include <gtest/gtest.h>



using android::Parcel;

using android::binder::Status;



TEST(Status, WriteOverParcel) {

    Status status = Status::fromExceptionCode(Status::EX_NULL_POINTER);



    Parcel indirect;

    indirect.writeInt32(64);

    status.writeOverParcel(&indirect);



    Parcel direct;

    status.writeToParcel(&direct);



    EXPECT_EQ(0, indirect.compareData(direct));

}