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

Commit f91905ab authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Fix the parceling of the ServiceStartArgs" into udc-dev am: fea5c6ee... 

Merge "Fix the parceling of the ServiceStartArgs" into udc-dev am: fea5c6ee am: 457ecf8e am: 747d55be

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23348642



Change-Id: I7f43779854f48f8f3f6923209bedebf37f74e87d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a93bf022 747d55be

core/java/android/app/ServiceStartArgs.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class ServiceStartArgs implements Parcelable { 
    public void writeToParcel(Parcel out, int flags) {

        out.writeInt(taskRemoved ? 1 : 0);

        out.writeInt(startId);

        out.writeInt(flags);

        out.writeInt(this.flags);

        if (args != null) {

            out.writeInt(1);

            args.writeToParcel(out, 0);