- 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: a4d2e929 -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: I3fd25f666b7ce10cc9477be68ba0c27e44fa3ccc 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 am: f43850da -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: I4377062b76f65d8e1c7be15eae5874a72a5a061f 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: ac863a9b -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: I3e8c8c2a7329b2ccc0037fdc1e98860c2a2cc33f 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: d841e1cd -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: I798404730d4f04c1610ff410e195f6ca189c54e5 Signed-off-by:
-
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: 499e70cc am: d974f621 -s ours am: 2407dae7 -s ours" into udc-d1-dev-plus-aosp am: 83f198fa -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: I85fc4320cd564c4320560274af5b6c01824dc718 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: 722f1187 -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: I3adf2f549cbc9038993911ae3058845e5e8e7fa3 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: 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:
-
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:
-
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:
-
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:
-
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
-
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: 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:
-
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: 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:
-
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
[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
-
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:
-
