summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2017-01-16 14:48:09 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-01-16 14:48:11 +0000
commitc5e5442acd41d5632fd2cdf7fa9f1c87be4a2115 (patch)
tree6d7775d7ecbc540628236e432f0433b2f1233f18 /core/java
parent8df5bd1028ca34b34202b81775505fb016c9b2da (diff)
parent14fae06b603b431f341453ddbfa69bbc2e03c959 (diff)
Merge "Add nullable parameter to readEmbeddedBuffer."
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/HwParcel.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/HwParcel.java b/core/java/android/os/HwParcel.java
index c7612d16d0c0..a265dd08a92f 100644
--- a/core/java/android/os/HwParcel.java
+++ b/core/java/android/os/HwParcel.java
@@ -212,7 +212,7 @@ public class HwParcel {
public native final HwBlob readBuffer();
public native final HwBlob readEmbeddedBuffer(
- long parentHandle, long offset);
+ long parentHandle, long offset, boolean nullable);
public native final void writeBuffer(HwBlob blob);