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

Merge "Correct ActivityInfo constructors." into mnc-dr-dev

Browse Source
This commit is contained in:
Rob Carr
2015-10-20 18:20:27 +00:00
committed by Android (Google) Code Review
parent 3bd3655fd0 8ab115a9aa
commit cfea184d6c
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/content/pm/ActivityInfo.java
View File

@@ -33,6 +33,10 @@ import java.lang.annotation.RetentionPolicy;
*/ */
public class ActivityInfo extends ComponentInfo public class ActivityInfo extends ComponentInfo
implements Parcelable { implements Parcelable {
// NOTE: When adding new data members be sure to update the copy-constructor, Parcel
// constructor, and writeToParcel.
/** /**
* A style resource identifier (in the package's resources) of this * A style resource identifier (in the package's resources) of this
* activity's theme. From the "theme" attribute or, if not set, 0. * activity's theme. From the "theme" attribute or, if not set, 0.
@@ -705,6 +709,7 @@ public class ActivityInfo extends ComponentInfo
super(orig); super(orig);
theme = orig.theme; theme = orig.theme;
launchMode = orig.launchMode; launchMode = orig.launchMode;
documentLaunchMode = orig.documentLaunchMode;
permission = orig.permission; permission = orig.permission;
taskAffinity = orig.taskAffinity; taskAffinity = orig.taskAffinity;
targetActivity = orig.targetActivity; targetActivity = orig.targetActivity;
@@ -780,6 +785,7 @@ public class ActivityInfo extends ComponentInfo
super.writeToParcel(dest, parcelableFlags); super.writeToParcel(dest, parcelableFlags);
dest.writeInt(theme); dest.writeInt(theme);
dest.writeInt(launchMode); dest.writeInt(launchMode);
dest.writeInt(documentLaunchMode);
dest.writeString(permission); dest.writeString(permission);
dest.writeString(taskAffinity); dest.writeString(taskAffinity);
dest.writeString(targetActivity); dest.writeString(targetActivity);
@@ -809,6 +815,7 @@ public class ActivityInfo extends ComponentInfo
super(source); super(source);
theme = source.readInt(); theme = source.readInt();
launchMode = source.readInt(); launchMode = source.readInt();
documentLaunchMode = source.readInt();
permission = source.readString(); permission = source.readString();
taskAffinity = source.readString(); taskAffinity = source.readString();
targetActivity = source.readString(); targetActivity = source.readString();