- Oct 12, 2023
-
-
Kweku Adams authored
[automerger skipped] Merge "Avoid loading duplicate jobs." into main am: 6d6c537b am: e6707e3a -s ours am: 12f7ac70 -s ours am skip reason: Merged-In I3179261309031801f0506cf905206376e59af1fe with SHA-1 104d21d0 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786380 Change-Id: I659c87699861b98ee8a53e470bb1c1ae2fc94ff3 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Automerger Merge Worker authored
Merge "[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours am: 4f70c066 -s ours am: 78e96991 -s ours" into udc-d1-dev-plus-aosp
-
Kweku Adams authored
[automerger skipped] Merge "Avoid loading duplicate jobs." into main am: 6d6c537b am: e6707e3a -s ours am skip reason: Merged-In I3179261309031801f0506cf905206376e59af1fe with SHA-1 104d21d0 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786380 Change-Id: I97e86175f5f8600fda910cae8e5be5e34e5e6a38 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours am: 4f70c066 -s ours am: e04fcd5b -s ours am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I8ae7896529090ecce063130ec63272054ef73419 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours am: 4f70c066 -s ours am: 78e96991 -s ours am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I0ab0d9a7b2631650f7431d29e75e559f8a82e371 Signed-off-by:
-
-
Treehugger Robot authored
[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: 499e70cc am: d974f621 -s ours am: 2407dae7 -s ours am skip reason: Merged-In Ic7688a00a07705301e5b06ee8783e801395e9f15 with SHA-1 97f621d8 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: Ia51cac2cf35683e59195e186b55a58f3baeeabca Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: 499e70cc am: d974f621 am: 5c2fe7e8 -s ours am skip reason: Merged-In Ic7688a00a07705301e5b06ee8783e801395e9f15 with SHA-1 97f621d8 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23835332 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I5162845ffdcde8223357b90e49c7ebfa4481d21c Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours am: 4f70c066 -s ours am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: Ia6700fe14e18051992a77efa545f1c61044ca1ad Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours am: 4f70c066 -s ours am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: Icb73db2636c3a3987fb3f98f1d8f8bbd75984fe5 Signed-off-by:
-
Kweku Adams authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786380 Change-Id: I94fff068332a141de2e01849e9e0f05dc8bf5d3d Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: 499e70cc am: d974f621 -s ours am skip reason: Merged-In Ic7688a00a07705301e5b06ee8783e801395e9f15 with SHA-1 97f621d8 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23835332 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I6cbad2764fd301b4a9cc1ad75886ee3b2de8a412 Signed-off-by:
-
Treehugger Robot authored
Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: 499e70cc am: d974f621 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I2d67d546f47eefa995b3e9bb2b17bb294ebe7753 Signed-off-by:
-
Treehugger Robot authored
[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I92b14d5740916b202c330670bbb432247385180a Signed-off-by:
-
Kweku Adams authored
-
Kweku Adams authored
If the persisted files have somehow accumulated duplicate versions of the same job (identified by uid-namespace-jobId), then drop the duplicates and only keep one. Bug: 289062813 Bug: 296890885 Test: atest JobStoreTest Change-Id: I3179261309031801f0506cf905206376e59af1fe (cherry picked from commit c8fbd937) Merged-In: I3179261309031801f0506cf905206376e59af1fe
-
Treehugger Robot authored
Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: 499e70cc Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I385d8f49baff800980f303b0e3723f5f40421f3a Signed-off-by:
-
Treehugger Robot authored
Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I99b0be9a800ee1397dfd1e62b26547853aba370c Signed-off-by:
-
Kweku Adams authored
Merge "Don't penalize app for slow app binding." into main am: b8989c8b am: 8724066b am: 23954c97 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786741 Change-Id: Ia539c6c15a36493351601029279fbb16255cfb29 Signed-off-by:
-
Harshit Mahajan authored
Merge "Revert "Rollback package after reboot has been performed"" into main am: 3f3a9465 am: 3e56a834 am: f0eef249 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786740 Change-Id: Iefd294d6bb886c9299ab173e416276da13a68dab Signed-off-by:
-
Kweku Adams authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786741 Change-Id: I33d16457ee1ec7943c6eb5108af17b08c355f011 Signed-off-by:
-
Jihoon Kang authored
Merge "Add module lib and test union java_api_library module" into main am: d135292f am: 1385c170 am: fc238577 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775453 Change-Id: Iae4998018d97bb7992f220f18f686074f771f7da Signed-off-by:
-
Treehugger Robot authored
Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I87c6a52cc6d0496f1df6f718fe859759ebffc93f Signed-off-by:
-
Treehugger Robot authored
Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I3e9856a3a8140ae74329f92b8cf0d8edddd53dfb Signed-off-by:
-
Anton Hansson authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784249 Change-Id: I1896e9b44aab2b9df395a31fe1d0057fff5deb63 Signed-off-by:
-
Kweku Adams authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786741 Change-Id: I1d7c00685cede232ef880d9f2112ba1da3f35bd6 Signed-off-by:
-
Kweku Adams authored
-
Kweku Adams authored
The system may be busy when trying to bind to the app, so don't penalize it for slow binding. Now, we'll retain the job that was slow to bind and stop triggering an ANR. Bug: 292090044 Bug: 303533836 Test: atest CtsJobSchedulerTestCases:JobSchedulingTest Change-Id: Ida52d63c5e9710d9d590388d20fceb4fa8f2e0d5 (cherry picked from commit 71fdfd48) Merged-In: Ida52d63c5e9710d9d590388d20fceb4fa8f2e0d5
-
Harshit Mahajan authored
Merge "Revert "Rollback package after reboot has been performed"" into main am: 3f3a9465 am: 3e56a834 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786740 Change-Id: I20465e8a73bb65defc7455dbdd983c41e4fe3180 Signed-off-by:
-
Jihoon Kang authored
Merge "Add module lib and test union java_api_library module" into main am: d135292f am: 1385c170 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775453 Change-Id: Ia8a4a2f21254e123b34ad4d0c544831495b641ad Signed-off-by:
-
Anton Hansson authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784249 Change-Id: Id4f0f82d65b32a93f9447e3f5a66b18f62ef08bc Signed-off-by:
-
Treehugger Robot authored
Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: Iaaddb48ba005fb905cd23c1cd00b438995f31760 Signed-off-by:
-
Harshit Mahajan authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786740 Change-Id: I74c3249281d72f7b0c99d1ee1251e5ae700d75f8 Signed-off-by:
-
Harshit Mahajan authored
-
Jihoon Kang authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775453 Change-Id: I2e987f35dcbd190db7171a9ba6e5cace06a08607 Signed-off-by:
-
Anton Hansson authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784249 Change-Id: I50c2805f1ad233ab2b922af95d73b0d6094f4275 Signed-off-by:
-
Jihoon Kang authored
-
Treehugger Robot authored
Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I176206d0ac2313d45260c5c853b6e9a151bb1173 Signed-off-by:
-
Anton Hansson authored
-
Treehugger Robot authored
Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I82a6481796b0012a023f464cc8d65151faed1c2e Signed-off-by:
-
