- Oct 12, 2023
-
-
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: 819f8b11 -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: I3d903bcc51887cb121a24f5ba41165afd5df3d88 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Ikram Gabiyev authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25008098 Change-Id: Ifcd7a22bb163a042f866bcdd6467e9a6d727dbad 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: 86365047 -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: Ib29bc0469ad0181f465555ba875ce6144508561c 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: 4021fc68 -s ours am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 63f0d1e8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: I81194a13c99424973566caf4f6d05ef23450e2e0 Signed-off-by:
-
Charles Wang authored
Merge "Fixes failing CTS tests for custom description in save dialog. Screenshots showing no changes from before: http://shortn/_n52tNerWx6" into udc-qpr-dev am: 31000f26 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24929524 Change-Id: If2ca95ede7c97526a0425554033a41de5b802e76 Signed-off-by:
-
Ikram Gabiyev authored
-
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: I9e3a45e94ef0790e43957ff1ac88f7c59297d1c7 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 I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 63f0d1e8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25023593 Change-Id: Ice6281715bdad498239e9d9a72a54986c2e8bd44 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:
-
Charles Wang authored
Merge "Fixes failing CTS tests for custom description in save dialog. Screenshots showing no changes from before: http://shortn/_n52tNerWx6" into udc-qpr-dev
-
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
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:
-
Charles Wang authored
Screenshots showing no changes from before: http://shortn/_n52tNerWx6 Test: atest CtsAutofillServiceTestCases; screenshots on pixel/foldable/tablet Bug: b/301709010 Change-Id: If63c566d1acc2e9064d634ee96e0c7d48c1baf87 Merged-In: I29f9bcf58462d4a570f395594ab83d94fcbaff55
-
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:
-
Kweku Adams authored
Merge "Don't penalize app for slow app binding." into main am: b8989c8b am: 8724066b am: 23954c97 am: 5506fba8 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786741 Change-Id: I4bd394e04e71a5d6c2ee8b77ba8a999b465f779f 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:
-
Harshit Mahajan authored
[automerger skipped] Merge "Revert "Rollback package after reboot has been performed"" into main am: 3f3a9465 am: 3e56a834 am: f0eef249 am: 3fde5e79 -s ours am skip reason: Merged-In If5612bd68cd0ba7c3b9e9f68dac84be3f1482164 with SHA-1 dfb2bfeb is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786740 Change-Id: I34713c689d8d45430ea72e62f475da40125bbb95 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 am: 43b3f4df Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775453 Change-Id: Ice7ec602e9d3acb0c7bf6fc939504604538f85aa Signed-off-by:
-
Anton Hansson authored
Merge "Fix broken links to AudioVolumeGroup" into main am: 47c10d04 am: 5cf090c1 am: a982126a am: 09754592 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784249 Change-Id: Ic340d4ed40ccc5bf26e24ca39bd26fb8df6ec013 Signed-off-by:
-
Andreas Miko authored
Merge "Fix unlock jank - send `forceIfAnimating` only for biometric unlocks" into udc-qpr-dev am: 0eb2be8b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25008468 Change-Id: If17ff313658e0deb35dfcf06aad1cb6f8e0ed384 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:
-
Andreas Miko authored
-
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:
-
