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

Commit 02f3a5f0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Minor updates to reflect libbinder changes."

parents 9b07338c 9cd7af31

core/java/android/net/IpPrefix.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,4 +17,4 @@ 




package android.net;

package android.net;





parcelable IpPrefix;
 
parcelable IpPrefix cpp_header "binder/IpPrefix.h";

core/java/android/os/Parcel.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -211,7 +211,7 @@ public final class Parcel { 
    private static final Parcel[] sOwnedPool = new Parcel[POOL_SIZE];

    private static final Parcel[] sOwnedPool = new Parcel[POOL_SIZE];

    private static final Parcel[] sHolderPool = new Parcel[POOL_SIZE];

    private static final Parcel[] sHolderPool = new Parcel[POOL_SIZE];





    // Keep in sync with frameworks/native/libs/binder/PersistableBundle.cpp.

    // Keep in sync with frameworks/native/include/private/binder/ParcelValTypes.h.

    private static final int VAL_NULL = -1;

    private static final int VAL_NULL = -1;

    private static final int VAL_STRING = 0;

    private static final int VAL_STRING = 0;

    private static final int VAL_INTEGER = 1;

    private static final int VAL_INTEGER = 1;