summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorAdam Skory <skory@google.com>2015-06-05 19:08:01 -0600
committerAdam Skory <skory@google.com>2015-06-05 19:08:01 -0600
commite76e7014c7aa22f56f1b82c87d9d80106b5ddcc1 (patch)
tree6258b01e77e3895f5526e4d3262bbcdcd96ff937 /core/java
parenta28863e76979a3551509d8e5eccf3a1c7c604022 (diff)
downloadframeworks_base-e76e7014c7aa22f56f1b82c87d9d80106b5ddcc1.zip
frameworks_base-e76e7014c7aa22f56f1b82c87d9d80106b5ddcc1.tar.gz
frameworks_base-e76e7014c7aa22f56f1b82c87d9d80106b5ddcc1.tar.bz2
Don't forget to parcel mIsAppProvidedIntent
If you forget to parcel it like I did, it's not going to do you much good. Change-Id: I85191594e7ffab2c36aeed317932b126da288bdf
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/AssistContent.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/AssistContent.java b/core/java/android/app/AssistContent.java
index 8c98aa9..d23e73d 100644
--- a/core/java/android/app/AssistContent.java
+++ b/core/java/android/app/AssistContent.java
@@ -152,6 +152,7 @@ public class AssistContent {
if (in.readInt() != 0) {
mUri = Uri.CREATOR.createFromParcel(in);
}
+ mIsAppProvidedIntent = in.readInt() == 1;
}
/** @hide */
@@ -174,5 +175,6 @@ public class AssistContent {
} else {
dest.writeInt(0);
}
+ dest.writeInt(mIsAppProvidedIntent ? 1 : 0);
}
}