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

am 3f6bf4b2: am e76e7014: Don\'t forget to parcel mIsAppProvidedIntent

Browse Source 
* commit '3f6bf4b287052f3fface43dd0377bcfada087de6':
  Don't forget to parcel mIsAppProvidedIntent
This commit is contained in:
Adam Skory
2015-06-06 01:33:09 +00:00
committed by Android Git Automerger
parent 8e7f05c86e 3f6bf4b287
commit faf041da26
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/AssistContent.java
View File

@@ -152,6 +152,7 @@ public class AssistContent {
if (in.readInt() != 0) { if (in.readInt() != 0) {
mUri = Uri.CREATOR.createFromParcel(in); mUri = Uri.CREATOR.createFromParcel(in);
} }
mIsAppProvidedIntent = in.readInt() == 1;
} }
/** @hide */ /** @hide */
@@ -174,5 +175,6 @@ public class AssistContent {
} else { } else {
dest.writeInt(0); dest.writeInt(0);
} }
dest.writeInt(mIsAppProvidedIntent ? 1 : 0);
} }
} }