Merge "Align the Kotlin sample code for Parcelable with Java" (245f8521) · Commits · e / os / android_frameworks_base

core/java/android/os/Parcelable.java

+6 −9

Original line number	Original line	Diff line number	Diff line
	@@ -44,9 +44,7 @@ import java.lang.annotation.RetentionPolicy;
	* out.writeInt(mData)		* out.writeInt(mData)
	* }		* }
	*		*
	* companion object {		* companion object CREATOR: Parcelable.Creator<MyParcelable?> {
	* val CREATOR: Parcelable.Creator<MyParcelable?>
	* = object : Parcelable.Creator<MyParcelable?> {
	* override fun createFromParcel(`in`: Parcel): MyParcelable? {		* override fun createFromParcel(`in`: Parcel): MyParcelable? {
	* return MyParcelable(`in`)		* return MyParcelable(`in`)
	* }		* }
	@@ -56,7 +54,6 @@ import java.lang.annotation.RetentionPolicy;
	* }		* }
	* }		* }
	* }		* }
	* }
	* </pre>		* </pre>
	* </section><section><h3 id="java">Java</h3>		* </section><section><h3 id="java">Java</h3>
	* <pre class="prettyprint lang-java">		* <pre class="prettyprint lang-java">