Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ab115a9 authored by Robert Carr's avatar Robert Carr Committed by Rob Carr
Browse files

Correct ActivityInfo constructors. 

ActivityInfo was missing initialization for the
documentLaunchMode flag in the copy-constructor
and the Parcel constructor. The copy-constructor
is used in multi-user/profile mode to create a
seperate instance of the ActivityInfo per uid
and this was manifesting in the linked bug.

Bug: 21590916
Change-Id: I6f71d94ec32ec6326d23c9b62e9d8d319e2fa25e
(cherry picked from commit 3e2e0117)
parent 1a4efb77

core/java/android/content/pm/ActivityInfo.java

+8 −1
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ import java.lang.annotation.RetentionPolicy; 
 */

public class ActivityInfo extends ComponentInfo

        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

     * activity's theme.  From the "theme" attribute or, if not set, 0.
@@ -705,6 +709,7 @@ public class ActivityInfo extends ComponentInfo 
        super(orig);

        theme = orig.theme;

        launchMode = orig.launchMode;

        documentLaunchMode = orig.documentLaunchMode;

        permission = orig.permission;

        taskAffinity = orig.taskAffinity;

        targetActivity = orig.targetActivity;
@@ -780,6 +785,7 @@ public class ActivityInfo extends ComponentInfo 
        super.writeToParcel(dest, parcelableFlags);

        dest.writeInt(theme);

        dest.writeInt(launchMode);

        dest.writeInt(documentLaunchMode);

        dest.writeString(permission);

        dest.writeString(taskAffinity);

        dest.writeString(targetActivity);
@@ -809,6 +815,7 @@ public class ActivityInfo extends ComponentInfo 
        super(source);

        theme = source.readInt();

        launchMode = source.readInt();

        documentLaunchMode = source.readInt();

        permission = source.readString();

        taskAffinity = source.readString();

        targetActivity = source.readString();