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

Commit 7221a5fc authored by Steven Moreland's avatar Steven Moreland
Browse files

Merge commit '27f73862' into 20201012185600 

Fix conflict (no conflict when merging locally, but conflict from automerger)

Test: build only

Change-Id: Ib602f7a2180a81e523c36b0de7db017dfb67166a
parents d72053c6 27f73862

libs/binder/fuzzer/Android.bp→libs/binder/parcel_fuzzer/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ cc_fuzz { 
        "binder_ndk.cpp",

        "hwbinder.cpp",

        "main.cpp",

        "random_fd.cpp",

        "random_parcel.cpp",

        "util.cpp",

    ],

    static_libs: [

libs/binder/fuzzer/binder.h→libs/binder/parcel_fuzzer/binder.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#pragma once



#include <binder/Parcel.h>

#include <vector>

libs/binder/fuzzer/binder_ndk.h→libs/binder/parcel_fuzzer/binder_ndk.h

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#pragma once



#include <android/binder_auto_utils.h>

#include <vector>
@@ -31,6 +32,9 @@ public: 
    const AParcel* aParcel() const { return mParcel.get(); }

    AParcel* aParcel() { return mParcel.get(); }



    android::Parcel* parcel() { return aParcel()->get(); }



    const uint8_t* data() const { return aParcel()->get()->data(); }

    size_t dataSize() const { return aParcel()->get()->dataSize(); }

    size_t dataAvail() const { return aParcel()->get()->dataAvail(); }

    size_t dataPosition() const { return aParcel()->get()->dataPosition(); }