Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Minor updates to reflect libbinder changes."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-31 01:53:13 +00:00
committed by Android (Google) Code Review
parent 9b07338cb2 9cd7af310c
commit 02f3a5f0e7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/IpPrefix.aidl
View File

@@ -17,4 +17,4 @@
package android.net;
parcelable IpPrefix;
parcelable IpPrefix cpp_header "binder/IpPrefix.h";

2
core/java/android/os/Parcel.java
View File

@@ -211,7 +211,7 @@ public final class Parcel {
private static final Parcel[] sOwnedPool = 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_STRING = 0;
private static final int VAL_INTEGER = 1;