| commit | 457ecf8ecb0766c1ce8f4eac66e6763df7faade9 | [log] [tgz] |
|---|---|---|
| author | Jing Ji <jji@google.com> | Thu May 25 18:00:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 25 18:00:29 2023 +0000 |
| tree | 1d4495d4126285e7e99cdffa80b49f61f078cd39 | |
| parent | 903f8374c371c1ebfb5b7e3d9b7c48580de8a0cc [diff] | |
| parent | fea5c6ee46208dfc084065caa17cccd739d97747 [diff] |
Merge "Fix the parceling of the ServiceStartArgs" into udc-dev am: fea5c6ee46 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23348642 Change-Id: Ia94634d2aa29f5eb08343dc1ea24680ccc26e489 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/app/ServiceStartArgs.java b/core/java/android/app/ServiceStartArgs.java index 0b000af5..9c52367 100644 --- a/core/java/android/app/ServiceStartArgs.java +++ b/core/java/android/app/ServiceStartArgs.java
@@ -49,7 +49,7 @@ 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);