)]}' { "log": [ { "commit": "5caf840c13bf9939fbfa3ae12e8d8523d349ca78", "tree": "60ff0113bf987f9e408c688f679035cf2e62cfb4", "parents": [ "557c037ed8c17d3c79cb4aecc5b7bb3aff62fd99", "ddfc061cadf2e2e975a4c3219c6f8554cbdce7fb" ], "author": { "name": "Omar Eissa", "email": "oeissa@google.com", "time": "Tue Mar 18 04:03:01 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 04:03:01 2025 -0700" }, "message": "Merge \"Clean up fuse bind mount on parent user when clone profile goes away\" into main" }, { "commit": "ddfc061cadf2e2e975a4c3219c6f8554cbdce7fb", "tree": "0dd1c0b47d49b24d60aa28029e2a867b98102c26", "parents": [ "7081c00d7bc06bb00af4ddcac99b0b81ae1f6271" ], "author": { "name": "Omar Eissa", "email": "oeissa@google.com", "time": "Mon Mar 10 08:15:10 2025 -0800" }, "committer": { "name": "Omar Eissa", "email": "oeissa@google.com", "time": "Thu Mar 13 11:46:20 2025 -0700" }, "message": "Clean up fuse bind mount on parent user when clone profile goes away\n\nCurrently, when fuse bpf is disabled, when clone profile gets removed,\nwe try to unbind mounts we created between clone profile\nand parent user only on clone profile. Not unbinding mounts for parent\nprofile emulated volume, would keep fuse daemon of clone profile alive.\nHence, this would prevent any further mounts for the same\nemulated volume of the same clone profile, as we will assume there is\nalready running fuse daemon.\n\nBug: 401029618\nTest: Manual\nFlag: EXEMPT bugfix\nChange-Id: I0b794e488b34ee8ed110aa847344b14f305ce728\n" }, { "commit": "557c037ed8c17d3c79cb4aecc5b7bb3aff62fd99", "tree": "fcf3a9114f71d4636b7158fb477791de5d737b4f", "parents": [ "7081c00d7bc06bb00af4ddcac99b0b81ae1f6271", "71647b96b7f070f34bd2025e0896d597a2e770a9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Mar 10 10:59:45 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Mar 10 10:59:45 2025 -0700" }, "message": "Merge \"Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\" into main" }, { "commit": "71647b96b7f070f34bd2025e0896d597a2e770a9", "tree": "fcf3a9114f71d4636b7158fb477791de5d737b4f", "parents": [ "7081c00d7bc06bb00af4ddcac99b0b81ae1f6271", "0fee5c9a08f7147d6708b38381eb413c0e968ef2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:10:07 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:10:07 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\n\nBug: 385190204\nMerged-In: Ib29382d17cc4fd6b479c68674f2efaa1ac626f19\nChange-Id: I3f708d122f3f899af5828e67a0287fe8a28bef33\n" }, { "commit": "0fee5c9a08f7147d6708b38381eb413c0e968ef2", "tree": "fcf3a9114f71d4636b7158fb477791de5d737b4f", "parents": [ "d0cd40f22f504a7a8ae22b24ca1a0738c86b6f51", "7081c00d7bc06bb00af4ddcac99b0b81ae1f6271" ], "author": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Thu Mar 06 15:03:30 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 06 15:03:30 2025 -0800" }, "message": "Merge \"checkpoint: Fix metadata file contents bug\" into main am: 7081c00d7b\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3529517\n\nChange-Id: I569f36299e1f9af03e0d5d9ae047a170bb9b1708\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7081c00d7bc06bb00af4ddcac99b0b81ae1f6271", "tree": "c4705309df0256bb423c7d148ddeff3f6b733196", "parents": [ "bdf2b653542cabea06b164013a73958303ec26bf", "582fca7dd5fcd96b7064f8bb977974b573168762" ], "author": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Thu Mar 06 14:37:59 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Mar 06 14:37:59 2025 -0800" }, "message": "Merge \"checkpoint: Fix metadata file contents bug\" into main" }, { "commit": "582fca7dd5fcd96b7064f8bb977974b573168762", "tree": "c4705309df0256bb423c7d148ddeff3f6b733196", "parents": [ "bdf2b653542cabea06b164013a73958303ec26bf" ], "author": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Thu Mar 06 13:24:03 2025 -0600" }, "committer": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Thu Mar 06 13:24:03 2025 -0600" }, "message": "checkpoint: Fix metadata file contents bug\n\nIn aosp/787759, Checkpoint changed the way kMetadataCPFile stored the\nretry count, but didn\u0027t account for \"-1\" as a special case. As a result,\nCheckpoint no longer reported `needsRollback` to be true when\n`startCheckpoint(-1)` was called.\n\nBug: none\nTest: presubmits (lmk if there\u0027s something better)\nChange-Id: I4acb929eb3471409b986f74493993a9f1d84e4a5\n" }, { "commit": "d0cd40f22f504a7a8ae22b24ca1a0738c86b6f51", "tree": "9cc4396ccc3902ae31d9ade6dd3961497e66c7cc", "parents": [ "f352f9fccca37025424eedf1fa2772fcfa4fcd8c", "2f407653f3186aa2b537d31e322bd2ef2b8d0a0e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Feb 27 15:16:16 2025 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 27 15:16:16 2025 -0800" }, "message": "Merge \"Merge 25Q1 (ab/12770256) to aosp-main-future\" into aosp-main-future" }, { "commit": "f352f9fccca37025424eedf1fa2772fcfa4fcd8c", "tree": "cca88f14e1c6c292db3a102aa103839d3613236d", "parents": [ "cfeff307511887bd5218379c9d48b02b03a69acb", "bdf2b653542cabea06b164013a73958303ec26bf" ], "author": { "name": "Ronald Braunstein", "email": "rbraunstein@google.com", "time": "Wed Feb 26 12:07:45 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 26 12:07:45 2025 -0800" }, "message": "Merge \"[owners] Remove alanstokes@google.com from OWNERS\" into main am: bdf2b65354\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3505955\n\nChange-Id: I1e888d0287a172fe2b73fa526ecdf4ee2178d933\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bdf2b653542cabea06b164013a73958303ec26bf", "tree": "cca88f14e1c6c292db3a102aa103839d3613236d", "parents": [ "3da73d2c307cdda53fbeaf9174269a9e3f9a1c76", "ce7bb292ba7f1f226b8bb915e9442c108bb3242e" ], "author": { "name": "Ronald Braunstein", "email": "rbraunstein@google.com", "time": "Wed Feb 26 11:39:06 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 26 11:39:06 2025 -0800" }, "message": "Merge \"[owners] Remove alanstokes@google.com from OWNERS\" into main" }, { "commit": "ce7bb292ba7f1f226b8bb915e9442c108bb3242e", "tree": "cca88f14e1c6c292db3a102aa103839d3613236d", "parents": [ "3da73d2c307cdda53fbeaf9174269a9e3f9a1c76" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Mon Feb 24 09:27:56 2025 -0800" }, "committer": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Mon Feb 24 09:27:59 2025 -0800" }, "message": "[owners] Remove alanstokes@google.com from OWNERS\n\nThis suggested change is automatically generated based on group\nmemberships and affiliations.\n\nPlease approve this change and vote the highest CR. This will keep the OWNERs\nfile tidy. We ask that you do not ignore this change and approve it\nunless you know a reason the OWNER should remain. It can always be\nreverted if needed.\n\nIf this change is in error, vote the lowest CR value (i.e. reject the CL)\nand the bot will abandon it.\n\nSee the owner\u0027s recent review activity for context:\nhttps://android-review.googlesource.com/q/alanstokes@google.com\n\nTo report an issue, file a bug in the Infra\u003eCodereview component.\n\nChange-Id: I0fefd25a952cf7472b96dbfcfba0bb1542417060\n" }, { "commit": "2f407653f3186aa2b537d31e322bd2ef2b8d0a0e", "tree": "49bf99418250f36595ac7c9d4bd3d52339846137", "parents": [ "cfeff307511887bd5218379c9d48b02b03a69acb", "069138041ae7cce198ff522909e8db419afb7bb5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Feb 20 10:50:05 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Feb 20 10:50:05 2025 -0800" }, "message": "Merge 25Q1 (ab/12770256) to aosp-main-future\n\nBug: 385190204\nMerged-In: I2a904a81130ec40602ac7e44e1b1435cd1d54d8f\nChange-Id: Ie61d5554cdf28aabc4e2d366e9c5681e9b0fdf21\n" }, { "commit": "cfeff307511887bd5218379c9d48b02b03a69acb", "tree": "8639b63baac103e44c253480dd63ec6fececc7b1", "parents": [ "feff11ca28c535e0d8167c21071ba02daf8079b4", "3da73d2c307cdda53fbeaf9174269a9e3f9a1c76" ], "author": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Wed Feb 19 15:28:59 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 19 15:28:59 2025 -0800" }, "message": "Merge \"vold: remove f2fs reserved_blocks from storage total size\" into main am: 3da73d2c30\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3478385\n\nChange-Id: I59c897722b462a0bd72dbf3b76c17aed80660f94\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3da73d2c307cdda53fbeaf9174269a9e3f9a1c76", "tree": "8639b63baac103e44c253480dd63ec6fececc7b1", "parents": [ "c5e2bd421928b93bc45f86663554bd399ee7318a", "06a1e0ee9ff2603ccaba6023e88cad3978a0c8b1" ], "author": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Wed Feb 19 14:58:49 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 19 14:58:49 2025 -0800" }, "message": "Merge \"vold: remove f2fs reserved_blocks from storage total size\" into main" }, { "commit": "06a1e0ee9ff2603ccaba6023e88cad3978a0c8b1", "tree": "11468f3f1634439a71bda7473b6b598c0348dd3d", "parents": [ "a1106e398956875d59dea59cb4c6a9eeaf0bf723" ], "author": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Thu Feb 06 13:18:47 2025 -0800" }, "committer": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Wed Feb 19 21:40:08 2025 +0000" }, "message": "vold: remove f2fs reserved_blocks from storage total size\n\nF2FS reserved_blocks should not be included for storage total size,\nsince it can\u0027t be used by users and users must not be aware of this\nspace.\n\nBug: 394342775\nTest: check the total storage size of Setting App\nChange-Id: I4eba69938dee3edfce2db37e6703edccc685b63d\nSigned-off-by: Daeho Jeong \u003cdaehojeong@google.com\u003e\n" }, { "commit": "feff11ca28c535e0d8167c21071ba02daf8079b4", "tree": "80c849772965cd3960a4bb075aa6f71ef6378802", "parents": [ "f3d038136444b9217198e8b3ea7cb6eba8e89fb8", "c5e2bd421928b93bc45f86663554bd399ee7318a" ], "author": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Wed Feb 12 11:08:45 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 11:08:45 2025 -0800" }, "message": "Merge \"Make sure checkpoint listeners are always notified\" into main am: c5e2bd4219\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3489373\n\nChange-Id: I0193976671138833c3cfd3a9ed5a5a0491d5d471\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c5e2bd421928b93bc45f86663554bd399ee7318a", "tree": "80c849772965cd3960a4bb075aa6f71ef6378802", "parents": [ "ebd905b15e58289b764fad483a53d8c2a4cadfa1", "a2db7fe33bbdc805cdc7763da3f30881ec32e95d" ], "author": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Wed Feb 12 10:44:46 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 12 10:44:46 2025 -0800" }, "message": "Merge \"Make sure checkpoint listeners are always notified\" into main" }, { "commit": "a2db7fe33bbdc805cdc7763da3f30881ec32e95d", "tree": "9980cabc7ddbf8029b2fb3ef3b84e3ed0071c607", "parents": [ "a1106e398956875d59dea59cb4c6a9eeaf0bf723" ], "author": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Tue Feb 11 14:26:13 2025 -0600" }, "committer": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Tue Feb 11 14:52:55 2025 -0600" }, "message": "Make sure checkpoint listeners are always notified\n\nThe `IVoldCheckpointListener`s should be notified when checkpointing\ncompletes and when vold becomes aware that no checkpoint will be\nrequired. We were previously not notifying in the case where reading\nkMetadataCPFile returned `false` (error while reading) which tells vold\nthere isn\u0027t a checkpoint. Refactored `cp_needsCheckpoint` to make sure\nthis case isn\u0027t missed.\n\nBug: 362567323\nTest: m \u0026\u0026 ./vendor/google/tools/flashall \u0026\u0026 adb wait-for-device \u0026\u0026 adb reboot \u0026\u0026 adb wait-for-device \u0026\u0026 adb logcat -s storageproxyd:v vold:V Checkpoint:V\nChange-Id: I55a4b908655446517b961bb1affdae694b76a70d\n" }, { "commit": "f3d038136444b9217198e8b3ea7cb6eba8e89fb8", "tree": "300cc259ca1c46760a0e1fef7cd9a066449880f9", "parents": [ "5979ac1107a377413884f9c2031f7d3550ccf37f", "ebd905b15e58289b764fad483a53d8c2a4cadfa1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Feb 10 03:21:16 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 10 03:21:16 2025 -0800" }, "message": "Merge \"vold_native_service_fuzzer: Add signal() to handle SIGPIPE\" into main am: ebd905b15e\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3476133\n\nChange-Id: I2497e34f56bd41351fb6e9985712cf0e984572eb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ebd905b15e58289b764fad483a53d8c2a4cadfa1", "tree": "300cc259ca1c46760a0e1fef7cd9a066449880f9", "parents": [ "a1106e398956875d59dea59cb4c6a9eeaf0bf723", "45fee080666f406373521bf1933e05f0fbf62edd" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Feb 10 02:56:21 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Feb 10 02:56:21 2025 -0800" }, "message": "Merge \"vold_native_service_fuzzer: Add signal() to handle SIGPIPE\" into main" }, { "commit": "45fee080666f406373521bf1933e05f0fbf62edd", "tree": "300cc259ca1c46760a0e1fef7cd9a066449880f9", "parents": [ "a1106e398956875d59dea59cb4c6a9eeaf0bf723" ], "author": { "name": "Akhilesh Sanikop", "email": "akhilesh.sanikop@ittiam.com", "time": "Fri Jan 31 15:55:05 2025 +0530" }, "committer": { "name": "Akhilesh Sanikop", "email": "akhilesh.sanikop@ittiam.com", "time": "Wed Feb 05 12:20:16 2025 +0530" }, "message": "vold_native_service_fuzzer: Add signal() to handle SIGPIPE\n\nAdding signal handler to avoid abort() due to\nbroken pipe.\n\nTest: ./vold_native_service_fuzzer\nBug: 376201407\n\nChange-Id: I273817be521f63db3bbad4f4d9e22c1e97e19b4c\n" }, { "commit": "5979ac1107a377413884f9c2031f7d3550ccf37f", "tree": "d4867fe7e5cccdf68b27b0ba5a03a8a9c81df248", "parents": [ "88d7ba8453ae6891290066cb5d13b4021681ba58", "a1106e398956875d59dea59cb4c6a9eeaf0bf723" ], "author": { "name": "Daniel Lee", "email": "chullee@google.com", "time": "Fri Jan 17 13:18:57 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 13:18:57 2025 -0800" }, "message": "Merge \"Add APIs to manage WriteBooster buffer\" into main am: a1106e3989\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3250250\n\nChange-Id: Ie187b58344a797f851342389015bef6f2e599216\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a1106e398956875d59dea59cb4c6a9eeaf0bf723", "tree": "d4867fe7e5cccdf68b27b0ba5a03a8a9c81df248", "parents": [ "4a437e4675311c9fb7d8918a335a59cd366842a1", "32d2d259b54f9bc75a3f512d912f7d73f8daf918" ], "author": { "name": "Daniel Lee", "email": "chullee@google.com", "time": "Fri Jan 17 12:57:16 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jan 17 12:57:16 2025 -0800" }, "message": "Merge \"Add APIs to manage WriteBooster buffer\" into main" }, { "commit": "32d2d259b54f9bc75a3f512d912f7d73f8daf918", "tree": "d4867fe7e5cccdf68b27b0ba5a03a8a9c81df248", "parents": [ "4a437e4675311c9fb7d8918a335a59cd366842a1" ], "author": { "name": "Daniel Lee", "email": "chullee@google.com", "time": "Fri Aug 30 11:09:36 2024 -0700" }, "committer": { "name": "Daniel Lee", "email": "chullee@google.com", "time": "Thu Jan 16 22:17:44 2025 -0800" }, "message": "Add APIs to manage WriteBooster buffer\n\nFive new APIs are introduced to manage and flush\nUFS WriteBooster buffer.\n\nBug: 349648148\nTest: StorageManager.*WriteBooster*\nChange-Id: I2f82a2d8b08d83a63cbc3da4d9512792b0d472ba\nSigned-off-by: Daniel Lee \u003cchullee@google.com\u003e\n" }, { "commit": "88d7ba8453ae6891290066cb5d13b4021681ba58", "tree": "f41f044be42f93923bf02ce61ca207ee97affc3f", "parents": [ "505580b45502b94595f5d4ba2054d4ff5a74605c", "4a437e4675311c9fb7d8918a335a59cd366842a1" ], "author": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Fri Dec 20 10:48:54 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 20 10:48:54 2024 -0800" }, "message": "Merge \"Implement vendor-available vold interface\" into main am: 4a437e4675\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3387522\n\nChange-Id: I7c1836510590801f12ea1e8d189bb1b4a19f5b76\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4a437e4675311c9fb7d8918a335a59cd366842a1", "tree": "f41f044be42f93923bf02ce61ca207ee97affc3f", "parents": [ "505580b45502b94595f5d4ba2054d4ff5a74605c", "6ab2065e05627a25cd731a05d2e05f7c56ab6750" ], "author": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Fri Dec 20 10:07:39 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 20 10:07:39 2024 -0800" }, "message": "Merge \"Implement vendor-available vold interface\" into main" }, { "commit": "6ab2065e05627a25cd731a05d2e05f7c56ab6750", "tree": "f41f044be42f93923bf02ce61ca207ee97affc3f", "parents": [ "505580b45502b94595f5d4ba2054d4ff5a74605c" ], "author": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Tue Dec 03 15:21:45 2024 -0600" }, "committer": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Thu Dec 19 15:56:19 2024 -0600" }, "message": "Implement vendor-available vold interface\n\nBug: 362567323\nTest: mmm system/vold\nChange-Id: I967faeb221741cbd8d6c13b25cd57c37fbb6e839\n" }, { "commit": "069138041ae7cce198ff522909e8db419afb7bb5", "tree": "6d1cfeba5762b4eca34de1be78fe89434c26cc67", "parents": [ "d2561d174cf327ce02494cd7438f87dafee5ab6e", "505580b45502b94595f5d4ba2054d4ff5a74605c" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Dec 05 03:21:43 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 05 03:21:43 2024 +0000" }, "message": "Merge \"Add support for F2FS format for HDD device storage\" into main am: b9b56884a5 am: 505580b455\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3380188\n\nChange-Id: Ib47bd6857d31df2547f531fab5396860ae0aac4c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "505580b45502b94595f5d4ba2054d4ff5a74605c", "tree": "c74c97b8faaed5787657b4ff1484190b00ef604f", "parents": [ "9fdcefd0f7438330f4cadf5563f8d7e9d612b27e", "b9b56884a5461eeb74d6bb28f481800772ca2860" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Dec 05 02:58:13 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 05 02:58:13 2024 +0000" }, "message": "Merge \"Add support for F2FS format for HDD device storage\" into main am: b9b56884a5\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3380188\n\nChange-Id: I3cf4236a65ffadec6fc7f0ea8b8032f66497af95\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b9b56884a5461eeb74d6bb28f481800772ca2860", "tree": "c74c97b8faaed5787657b4ff1484190b00ef604f", "parents": [ "305620215ee73e7924ca53a23a42613dbeba2fff", "73670aad34228dbc4e516a3353962a0112b3c687" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Dec 05 02:38:17 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 05 02:38:17 2024 +0000" }, "message": "Merge \"Add support for F2FS format for HDD device storage\" into main" }, { "commit": "73670aad34228dbc4e516a3353962a0112b3c687", "tree": "c74c97b8faaed5787657b4ff1484190b00ef604f", "parents": [ "305620215ee73e7924ca53a23a42613dbeba2fff" ], "author": { "name": "Lyon Wang", "email": "lyon.wang@mediatek.com", "time": "Fri Nov 29 10:20:23 2024 +0800" }, "committer": { "name": "Lyon Wang", "email": "lyon.wang@mediatek.com", "time": "Tue Dec 03 17:51:39 2024 +0000" }, "message": "Add support for F2FS format for HDD device storage\n\nFormatting certain low-performance HDDs to ext4 as device storage\ncould trigger system reboots due to watchdog timeouts.\nThis commit adds support for F2FS format for HDDs,\nreducing the formatting time and preventing system reboots.\n\nBug: 255280614\nTest: format HDD to F2FS device storage\nChange-Id: Ic816156e1a3f3ac56629cb848be6499a3f6d0dde\n" }, { "commit": "d2561d174cf327ce02494cd7438f87dafee5ab6e", "tree": "36e99d76729ba60d6456605c20b5c807ec00c67b", "parents": [ "f9c9e85c9a87389f166bdd73c98b97078d94e6a6", "9fdcefd0f7438330f4cadf5563f8d7e9d612b27e" ], "author": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Mon Nov 18 18:09:42 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 18 18:09:42 2024 +0000" }, "message": "Merge \"vold: include multiple devices for calculating storage size\" into main am: 305620215e am: 9fdcefd0f7\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3349457\n\nChange-Id: I9ad1c0962930beb74cd32862528f7f8fa521f06d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9fdcefd0f7438330f4cadf5563f8d7e9d612b27e", "tree": "c1a6d0ff1d5f3604c4f3a4bed0a06b8f41dc9cb7", "parents": [ "f5be945b04fa89f3975786841f79e3d39280b7c1", "305620215ee73e7924ca53a23a42613dbeba2fff" ], "author": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Mon Nov 18 17:50:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 18 17:50:21 2024 +0000" }, "message": "Merge \"vold: include multiple devices for calculating storage size\" into main am: 305620215e\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3349457\n\nChange-Id: I54bc0225b9e1182f623904823dfad9e1f34c6dda\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "305620215ee73e7924ca53a23a42613dbeba2fff", "tree": "c1a6d0ff1d5f3604c4f3a4bed0a06b8f41dc9cb7", "parents": [ "d405821a5f91a450d334f28644c82523dc59051b", "3da20f4c83148e6f0aae76d575e38b8380cb1ef7" ], "author": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Mon Nov 18 17:25:58 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 18 17:25:58 2024 +0000" }, "message": "Merge \"vold: include multiple devices for calculating storage size\" into main" }, { "commit": "3da20f4c83148e6f0aae76d575e38b8380cb1ef7", "tree": "b12a1c46074eabd38095acc38e38a31b4b77690e", "parents": [ "0b7388489fd289fc455e0d97abb0d7644909b965" ], "author": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Wed Nov 13 13:25:16 2024 -0800" }, "committer": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Fri Nov 15 19:28:02 2024 +0000" }, "message": "vold: include multiple devices for calculating storage size\n\nSince F2FS supports multiple devices, we must include all the sizes of\nthem into the storage size.\n\nBug: 377560222\nTest: check the total size in Setting\nChange-Id: I4252733e16dac60f07899b29b016e7f11ef9a2ed\nSigned-off-by: Daeho Jeong \u003cdaehojeong@google.com\u003e\n" }, { "commit": "f9c9e85c9a87389f166bdd73c98b97078d94e6a6", "tree": "5091600db22ff2fc862bb2e7cd9df122ace56566", "parents": [ "cca61959c92416a133998684cf067373959c7ca3", "f5be945b04fa89f3975786841f79e3d39280b7c1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Nov 04 20:27:50 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 04 20:27:50 2024 +0000" }, "message": "Merge \"Fix uses-after-free\" into main am: d405821a5f am: f5be945b04\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3327245\n\nChange-Id: I49dfbadb462a7c0cb30da6cf7ff53a34158210f1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f5be945b04fa89f3975786841f79e3d39280b7c1", "tree": "e6ec7272d276344f8d392d2d7f54519eceeccd53", "parents": [ "396563edc75f2e90dc187c3ec8371a7f76c3b2f8", "d405821a5f91a450d334f28644c82523dc59051b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Nov 04 19:42:14 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 04 19:42:14 2024 +0000" }, "message": "Merge \"Fix uses-after-free\" into main am: d405821a5f\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3327245\n\nChange-Id: I6cf091830be2812001f348ae0c15b4b747d33840\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d405821a5f91a450d334f28644c82523dc59051b", "tree": "e6ec7272d276344f8d392d2d7f54519eceeccd53", "parents": [ "a5be02dd48980d65fb1b83eb068e36da3a6906a8", "04e04701901381f5ae966f6c217a0284cc0790cb" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Nov 04 19:23:16 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 04 19:23:16 2024 +0000" }, "message": "Merge \"Fix uses-after-free\" into main" }, { "commit": "04e04701901381f5ae966f6c217a0284cc0790cb", "tree": "e6ec7272d276344f8d392d2d7f54519eceeccd53", "parents": [ "a5be02dd48980d65fb1b83eb068e36da3a6906a8" ], "author": { "name": "Peter Collingbourne", "email": "pcc@google.com", "time": "Fri Nov 01 14:14:45 2024 -0700" }, "committer": { "name": "Peter Collingbourne", "email": "pcc@google.com", "time": "Fri Nov 01 15:44:29 2024 -0700" }, "message": "Fix uses-after-free\n\nThe code was previously taking the address of the device_name\nstring and passing it to execve (via an argument vector passed to\nlogwrap_fork_execvp) after device_name goes out of scope. Moreover,\nthe code for adding the length argument pushed the address of a\ntemporary to the vector. Fix it by having the code create a vector of\nstd::string for the arguments and only creating the vector of const\nchar * before calling logwrap_fork_execvp.\n\nBug: 376533537\nChange-Id: Ic066cd9a1d3be5a1a7e6ad997f81166c039bbcaf\n" }, { "commit": "cca61959c92416a133998684cf067373959c7ca3", "tree": "e15c8accbe154a902274e14e1613c0fbbdf5f619", "parents": [ "f7c835933105ef379f041d07f8f03afcffa6d6d3", "396563edc75f2e90dc187c3ec8371a7f76c3b2f8" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Thu Oct 31 17:31:34 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 31 17:31:34 2024 +0000" }, "message": "Merge \"Improve log messages when CE key is already protected by secret\" into main am: a5be02dd48 am: 396563edc7\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3327017\n\nChange-Id: Id0dd087c997cd4ba7eb3c19c17300219892a2952\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "396563edc75f2e90dc187c3ec8371a7f76c3b2f8", "tree": "e9875d60280aa2efb7d2156f1b75ff19b1c1a177", "parents": [ "4387097c1a56ce9001c23871e0a8f8844c233ccd", "a5be02dd48980d65fb1b83eb068e36da3a6906a8" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Thu Oct 31 16:57:14 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 31 16:57:14 2024 +0000" }, "message": "Merge \"Improve log messages when CE key is already protected by secret\" into main am: a5be02dd48\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3327017\n\nChange-Id: I4ea7008179478b488ba84510d2c2ba0b5fb6ab2e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a5be02dd48980d65fb1b83eb068e36da3a6906a8", "tree": "e9875d60280aa2efb7d2156f1b75ff19b1c1a177", "parents": [ "5502a557c106e0892b28009007809cbf37c5c47c", "d651359c9f8d99fc505a7fb4c747cd00339e72ab" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Thu Oct 31 16:51:27 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 31 16:51:27 2024 +0000" }, "message": "Merge \"Improve log messages when CE key is already protected by secret\" into main" }, { "commit": "d651359c9f8d99fc505a7fb4c747cd00339e72ab", "tree": "e9875d60280aa2efb7d2156f1b75ff19b1c1a177", "parents": [ "5502a557c106e0892b28009007809cbf37c5c47c" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Wed Oct 30 22:49:06 2024 +0000" }, "committer": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Thu Oct 31 03:42:15 2024 +0000" }, "message": "Improve log messages when CE key is already protected by secret\n\nThis is a bit of a hack, since ideally we should avoid logging errors in\nthe first place. But this CL is an improvement.\n\nThe following shows what the log looks like after this CL when\nsetCeStorageProtection() is called when the CE key is already protected:\n\n I LockSettingsService: Encrypting CE key of user 0 with synthetic password\n D vold : fscrypt_set_ce_key_protection 0\n D vold : CE key already exists on-disk; re-protecting it with the given secret\n D vold : Trying user CE key /data/misc/vold/user_keys/ce/0/current\n E vold : Failed to read from /data/misc/vold/user_keys/ce/0/current/keymaster_key_blob: No such file or directory\n E vold : decryptWithKeystoreKey failed\n E vold : Failed to find working ce key for user 0\n D vold : Trying user CE key /data/misc/vold/user_keys/ce/0/current\n D vold : Successfully retrieved key\n I vold : CE key is already protected by given secret. Nothing to do.\n I vold : Errors above are for the attempt with empty auth and can be ignored.\n\nTest: Upgraded a device from UQ1A to main with this CL. Checked the log.\nFlag: EXEMPT just changes log messages\nChange-Id: I5cf4bd0a1fcac80e9c192628fb7d112c0d320376\n" }, { "commit": "f7c835933105ef379f041d07f8f03afcffa6d6d3", "tree": "ec393cadf01c883788d070f7fcc4daeb536fd276", "parents": [ "d44aa9b67e9ed0d4e6117b3eb10d801d1758891d", "6b083c65dcfe7fb8fb85a9598548bf7b4d8b9e44" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Oct 29 06:07:30 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 29 06:07:30 2024 +0000" }, "message": "Merge \"[USB] Change default volume label for ExFat format mounts while formatting.\" into main" }, { "commit": "d44aa9b67e9ed0d4e6117b3eb10d801d1758891d", "tree": "7e9a45aa928ef5367bbf2e417a140b74bd797302", "parents": [ "1c5b2c92d61848090f109e6b585df964c0dda744", "4387097c1a56ce9001c23871e0a8f8844c233ccd" ], "author": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Mon Oct 28 17:43:14 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 28 17:43:14 2024 +0000" }, "message": "Merge \"add f2fs device aliasing related arguments in vold\" into main am: 5502a557c1 am: 4387097c1a\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3316515\n\nChange-Id: I421092091fd954ccf4f5a099d95d94509de15321\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4387097c1a56ce9001c23871e0a8f8844c233ccd", "tree": "7e9a45aa928ef5367bbf2e417a140b74bd797302", "parents": [ "997d053e39f3efb84cb0bef5ece69edb9cda3597", "5502a557c106e0892b28009007809cbf37c5c47c" ], "author": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Mon Oct 28 16:31:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 28 16:31:44 2024 +0000" }, "message": "Merge \"add f2fs device aliasing related arguments in vold\" into main am: 5502a557c1\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3316515\n\nChange-Id: I113b07a74a8684c55f3b3edbf357ed4dcf95e9a8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5502a557c106e0892b28009007809cbf37c5c47c", "tree": "7e9a45aa928ef5367bbf2e417a140b74bd797302", "parents": [ "0b7388489fd289fc455e0d97abb0d7644909b965", "0c841556b8c75c4f49df03a7a97ee00f6a40c474" ], "author": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Mon Oct 28 16:19:45 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 28 16:19:45 2024 +0000" }, "message": "Merge \"add f2fs device aliasing related arguments in vold\" into main" }, { "commit": "6b083c65dcfe7fb8fb85a9598548bf7b4d8b9e44", "tree": "05bc46da213df25ff2b06b8512c219f14f893632", "parents": [ "51e1ee7a4a382eac67851840d9cd3758a37f2069" ], "author": { "name": "“riyaghai”", "email": "riyaghai@google.com", "time": "Fri Oct 18 08:24:02 2024 +0000" }, "committer": { "name": "Riya Ghai", "email": "riyaghai@google.com", "time": "Thu Oct 24 06:58:14 2024 +0000" }, "message": "[USB] Change default volume label for ExFat format mounts while\nformatting.\n\nTest: manual by flashing and formatting drive.\n\nIgnore-AOSP-First: Needs to be tested and dogfooded internally first before sending to AOSP.\n\nBug: 256073477\n\nChange-Id: I2a904a81130ec40602ac7e44e1b1435cd1d54d8f\n" }, { "commit": "0c841556b8c75c4f49df03a7a97ee00f6a40c474", "tree": "7e9a45aa928ef5367bbf2e417a140b74bd797302", "parents": [ "0b7388489fd289fc455e0d97abb0d7644909b965" ], "author": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Mon Oct 21 14:05:31 2024 -0700" }, "committer": { "name": "Daeho Jeong", "email": "daehojeong@google.com", "time": "Tue Oct 22 17:40:18 2024 +0000" }, "message": "add f2fs device aliasing related arguments in vold\n\nTo support f2fs device aliasing feature, include related arguments in\nvold.\n\nBug: 336319772\nTest: add a device with \"exp_alias\" tag in fstab\nChange-Id: Ibb8766f4c77d532a596f5581f3de8dfb334ba2fd\nSigned-off-by: Daeho Jeong \u003cdaehojeong@google.com\u003e\n" }, { "commit": "1c5b2c92d61848090f109e6b585df964c0dda744", "tree": "0f7156887bbc88a54d291f76e2c16195ba07f4da", "parents": [ "e36510252e53b862a67997415ab84973079c04b4", "997d053e39f3efb84cb0bef5ece69edb9cda3597" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 18 21:13:06 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 18 21:13:06 2024 +0000" }, "message": "[automerger skipped] Merge \"Mark 24Q4 as merged in aosp-main-future\" into aosp-main-future am: 997d053e39 -s ours\n\nam skip reason: Merged-In I6000acc602b99d3cc6f0b7cc5b08c195d3be8a92 with SHA-1 fa727c04cf is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/29935628\n\nChange-Id: I4959287269fc5781f918f6a82188782d2515478e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e36510252e53b862a67997415ab84973079c04b4", "tree": "0f7156887bbc88a54d291f76e2c16195ba07f4da", "parents": [ "3eb576e3f579074c6156cad147814658a9ebb7ca", "0059af9cf3f1de2fcd047112b197e46dea0f5e39" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 18 21:12:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 18 21:12:44 2024 +0000" }, "message": "[automerger skipped] Mark 24Q4 as merged in aosp-main-future am: 0059af9cf3 -s ours\n\nam skip reason: Merged-In I6000acc602b99d3cc6f0b7cc5b08c195d3be8a92 with SHA-1 fa727c04cf is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/29935628\n\nChange-Id: Ib06cf033cc3ddb63a3cee6f10149518861046d79\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "997d053e39f3efb84cb0bef5ece69edb9cda3597", "tree": "0f7156887bbc88a54d291f76e2c16195ba07f4da", "parents": [ "453c331dcc0e9bcf90f83dbb7fc2e11159084ff1", "0059af9cf3f1de2fcd047112b197e46dea0f5e39" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 18 20:52:30 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 18 20:52:30 2024 +0000" }, "message": "Merge \"Mark 24Q4 as merged in aosp-main-future\" into aosp-main-future" }, { "commit": "3eb576e3f579074c6156cad147814658a9ebb7ca", "tree": "0f7156887bbc88a54d291f76e2c16195ba07f4da", "parents": [ "788ff42a35a3de543bffb5c94792ef6349da47c7", "453c331dcc0e9bcf90f83dbb7fc2e11159084ff1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Oct 18 18:58:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 18 18:58:02 2024 +0000" }, "message": "Merge \"More accurately validate the prerequisites for using emmc_optimized\" into main am: 0b7388489f am: 453c331dcc\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3295232\n\nChange-Id: Ibc19874d3137d022ebbb856ceb1cdde31c5b69bf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "453c331dcc0e9bcf90f83dbb7fc2e11159084ff1", "tree": "0f7156887bbc88a54d291f76e2c16195ba07f4da", "parents": [ "230042687832fc476c92d775395db40800f502fd", "0b7388489fd289fc455e0d97abb0d7644909b965" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Oct 18 18:35:37 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 18 18:35:37 2024 +0000" }, "message": "Merge \"More accurately validate the prerequisites for using emmc_optimized\" into main am: 0b7388489f\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3295232\n\nChange-Id: I9b915c7b448d86fbe4c8dc0e71e867fc4f259b84\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0b7388489fd289fc455e0d97abb0d7644909b965", "tree": "0f7156887bbc88a54d291f76e2c16195ba07f4da", "parents": [ "9d6a3dcca9e2f848cf1cd97b3d8df63dd9e80a36", "7bdf799848c30255fd90401d4096c15c794d9701" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Oct 18 18:22:15 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 18 18:22:15 2024 +0000" }, "message": "Merge \"More accurately validate the prerequisites for using emmc_optimized\" into main" }, { "commit": "788ff42a35a3de543bffb5c94792ef6349da47c7", "tree": "3b3cde1988f0025510cbb4567d50782271f9ec44", "parents": [ "fa727c04cf4589c0349dd210ad6f62d57e83940a", "230042687832fc476c92d775395db40800f502fd" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Oct 18 17:20:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 18 17:20:26 2024 +0000" }, "message": "Merge \"Stop using deprecated function AServiceManager_getService()\" into main am: 9d6a3dcca9 am: 2300426878\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3312779\n\nChange-Id: I2ee9f81626b7c31fa9a5607fff96dcc6533a1fd0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "230042687832fc476c92d775395db40800f502fd", "tree": "3b3cde1988f0025510cbb4567d50782271f9ec44", "parents": [ "2b156aad7deb30ab64cd1017d5ae66b3e4b0d286", "9d6a3dcca9e2f848cf1cd97b3d8df63dd9e80a36" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Oct 18 17:05:46 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 18 17:05:46 2024 +0000" }, "message": "Merge \"Stop using deprecated function AServiceManager_getService()\" into main am: 9d6a3dcca9\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3312779\n\nChange-Id: I4b5cae217281f34a4f10e2479437b24ce1413457\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7bdf799848c30255fd90401d4096c15c794d9701", "tree": "0f7156887bbc88a54d291f76e2c16195ba07f4da", "parents": [ "9d6a3dcca9e2f848cf1cd97b3d8df63dd9e80a36" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Oct 18 16:51:27 2024 +0000" }, "committer": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Oct 18 16:51:27 2024 +0000" }, "message": "More accurately validate the prerequisites for using emmc_optimized\n\nThe emmc_optimized encryption setting is allowed only when the inline\ncrypto hardware supports only 32-bit DUNs; see CDD 9.9.3.1 [C-1-15].\nvold tries to validate this setting accordingly, but previously it did\nnot have access to the actual DUN length, so instead it checked the\nstorage type to determine whether a 32-bit DUN limit *might* exist. In\nandroid14-5.15 and later kernels, the DUN length is exposed via a file\nin the disk\u0027s queue directory in sysfs, which allows doing this check\nproperly. Therefore, update vold to use this file when possible.\n\nBug: 207390665\nTest: Set emmc_optimized on (a) a device using UFS storage, and (b) a\n device using virtio storage with no inline crypto support passed\n through. Both with PRODUCT_SHIPPING_API_LEVEL \u003d 35. Verified\n that the devices failed to boot and the log showed the expected\n reasons. (I did not have a device actually using eMMC at hand.)\nChange-Id: Ib2f1cab313aa57e8d5aabe4ebfcc2d08909fcc89\n" }, { "commit": "9d6a3dcca9e2f848cf1cd97b3d8df63dd9e80a36", "tree": "3b3cde1988f0025510cbb4567d50782271f9ec44", "parents": [ "1e029dce710c7a1444dee12a14656da36921cbce", "bc75f869fbd19add421c3c8da40dd88af673ce4c" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Fri Oct 18 16:48:38 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 18 16:48:38 2024 +0000" }, "message": "Merge \"Stop using deprecated function AServiceManager_getService()\" into main" }, { "commit": "bc75f869fbd19add421c3c8da40dd88af673ce4c", "tree": "3b3cde1988f0025510cbb4567d50782271f9ec44", "parents": [ "1e029dce710c7a1444dee12a14656da36921cbce" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Thu Oct 17 18:57:30 2024 +0000" }, "committer": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Thu Oct 17 18:57:53 2024 +0000" }, "message": "Stop using deprecated function AServiceManager_getService()\n\nAServiceManager_getService() is marked as deprecated and causes compiler\nwarnings when building vold. It is deprecated because it waits for up\nto 5 seconds for the service to become available, which is an arbitrary\namount. Callers either want no wait (AServiceManager_checkService()) or\nan indefinite wait (AServiceManager_waitForService()). vold wants an\nindefinite wait, so switch to using AServiceManager_waitForService().\n\nTest: \u0027mmm system/vold\u0027 and verified that the warnings are gone\nTest: Boot Cuttlefish\nFlag: EXEMPT bugfix\nChange-Id: Id9e9686f6d4ab8ef3beb23f4a85efb850dc8fece\n" }, { "commit": "0059af9cf3f1de2fcd047112b197e46dea0f5e39", "tree": "37f32231bbf5bd2443b330416e3079744b359255", "parents": [ "2b156aad7deb30ab64cd1017d5ae66b3e4b0d286", "1411dc024a999280b2a61a8937011e98a48c4bf3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 17 11:03:40 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 17 11:03:40 2024 -0700" }, "message": "Mark 24Q4 as merged in aosp-main-future\n\nBug: 373937381\nMerged-In: I6000acc602b99d3cc6f0b7cc5b08c195d3be8a92\nChange-Id: Ibc4fcb8ee17506bd8e1584292dcbcd8b2051875b\n" }, { "commit": "fa727c04cf4589c0349dd210ad6f62d57e83940a", "tree": "37f32231bbf5bd2443b330416e3079744b359255", "parents": [ "1411dc024a999280b2a61a8937011e98a48c4bf3", "2b156aad7deb30ab64cd1017d5ae66b3e4b0d286" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Oct 16 19:00:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 16 19:00:52 2024 +0000" }, "message": "Merge \"Fix some compiler warnings in vold\" into main am: 1e029dce71 am: 2b156aad7d\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3312035\n\nChange-Id: I6000acc602b99d3cc6f0b7cc5b08c195d3be8a92\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2b156aad7deb30ab64cd1017d5ae66b3e4b0d286", "tree": "37f32231bbf5bd2443b330416e3079744b359255", "parents": [ "44f290912e01a481337b11107438889306fe41dc", "1e029dce710c7a1444dee12a14656da36921cbce" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Oct 16 18:48:37 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 16 18:48:37 2024 +0000" }, "message": "Merge \"Fix some compiler warnings in vold\" into main am: 1e029dce71\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3312035\n\nChange-Id: I84e3f78ac6b1979d5dca05a08790cc05170f048e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1e029dce710c7a1444dee12a14656da36921cbce", "tree": "37f32231bbf5bd2443b330416e3079744b359255", "parents": [ "15fd73eab0378bd827f98c82aed7e20357e3e4f2", "e1e62224068b9f282e9f2a524eff49be45b65ce1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Oct 16 18:29:25 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 16 18:29:25 2024 +0000" }, "message": "Merge \"Fix some compiler warnings in vold\" into main" }, { "commit": "e1e62224068b9f282e9f2a524eff49be45b65ce1", "tree": "37f32231bbf5bd2443b330416e3079744b359255", "parents": [ "15fd73eab0378bd827f98c82aed7e20357e3e4f2" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Wed Oct 16 17:24:56 2024 +0000" }, "committer": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Wed Oct 16 17:27:30 2024 +0000" }, "message": "Fix some compiler warnings in vold\n\nTest: mmm system/vold\nChange-Id: Idf0472093159909263028af045df62c41dcaa171\n" }, { "commit": "1411dc024a999280b2a61a8937011e98a48c4bf3", "tree": "7ecae0c8c1abceddea1478f6276dd464f944a1b4", "parents": [ "51e1ee7a4a382eac67851840d9cd3758a37f2069", "44f290912e01a481337b11107438889306fe41dc" ], "author": { "name": "Inseob Kim", "email": "inseob@google.com", "time": "Fri Sep 20 08:54:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 20 08:54:18 2024 +0000" }, "message": "Merge \"Do not umount /mnt/vm\" into main am: 15fd73eab0 am: 44f290912e\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3261819\n\nChange-Id: Id03e8fe9f0b811f9d9624961e34e6fec7abedd1b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "44f290912e01a481337b11107438889306fe41dc", "tree": "7ecae0c8c1abceddea1478f6276dd464f944a1b4", "parents": [ "7c13229c4e76e4b36e1a23a27d6ea136b532e72a", "15fd73eab0378bd827f98c82aed7e20357e3e4f2" ], "author": { "name": "Inseob Kim", "email": "inseob@google.com", "time": "Fri Sep 20 08:35:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 20 08:35:41 2024 +0000" }, "message": "Merge \"Do not umount /mnt/vm\" into main am: 15fd73eab0\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3261819\n\nChange-Id: Ibdc167aeadb2a0f9cea2868cee2fbd91ca28293c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "15fd73eab0378bd827f98c82aed7e20357e3e4f2", "tree": "7ecae0c8c1abceddea1478f6276dd464f944a1b4", "parents": [ "a8ce13c9b3c61c6135486559b3baf86718a0e172", "1e0299d018c2bc9790209a764f50159642b67b3d" ], "author": { "name": "Inseob Kim", "email": "inseob@google.com", "time": "Fri Sep 20 08:01:57 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Sep 20 08:01:57 2024 +0000" }, "message": "Merge \"Do not umount /mnt/vm\" into main" }, { "commit": "1e0299d018c2bc9790209a764f50159642b67b3d", "tree": "7ecae0c8c1abceddea1478f6276dd464f944a1b4", "parents": [ "a8ce13c9b3c61c6135486559b3baf86718a0e172" ], "author": { "name": "Inseob Kim", "email": "inseob@google.com", "time": "Fri Sep 13 14:02:49 2024 +0900" }, "committer": { "name": "Inseob Kim", "email": "inseob@google.com", "time": "Fri Sep 13 14:03:18 2024 +0900" }, "message": "Do not umount /mnt/vm\n\nIt is manually mounted in the init.rc.\n\nBug: 331320802\nTest: boot and check /mnt/vm\nChange-Id: I4ac4b0cec7bb1203446700e1cb2b1e142647d672\n" }, { "commit": "51e1ee7a4a382eac67851840d9cd3758a37f2069", "tree": "db75867a91fc5a4b950905036a24b3d46cee5ffe", "parents": [ "cb56772f3f004b7754a5959562a234856d8e32d0", "7c13229c4e76e4b36e1a23a27d6ea136b532e72a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Sep 06 00:08:37 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 06 00:08:37 2024 +0000" }, "message": "Merge \"Add timeout for mount on untrusted media\" into main am: a8ce13c9b3 am: 7c13229c4e\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3183131\n\nChange-Id: Ie57479794c45447e0b838fa2b4e49eddabb65087\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7c13229c4e76e4b36e1a23a27d6ea136b532e72a", "tree": "db75867a91fc5a4b950905036a24b3d46cee5ffe", "parents": [ "8fb30ca22bfdc226d09fa8f9fa1a762aaf768475", "a8ce13c9b3c61c6135486559b3baf86718a0e172" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 05 23:56:37 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 05 23:56:37 2024 +0000" }, "message": "Merge \"Add timeout for mount on untrusted media\" into main am: a8ce13c9b3\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3183131\n\nChange-Id: Ib57e97b36a41ed70516ecbdbede91a68a979a8e5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a8ce13c9b3c61c6135486559b3baf86718a0e172", "tree": "db75867a91fc5a4b950905036a24b3d46cee5ffe", "parents": [ "8fb30ca22bfdc226d09fa8f9fa1a762aaf768475", "8c5dd6e9605e6b0672fb6b908591edcb8591fcc8" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 05 23:48:20 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 05 23:48:20 2024 +0000" }, "message": "Merge \"Add timeout for mount on untrusted media\" into main" }, { "commit": "cb56772f3f004b7754a5959562a234856d8e32d0", "tree": "a8de8c57a0ec46c8bdde76ab64d638ee5c1e9e09", "parents": [ "1130dba5c98dfa492e791ee503bfaeb23122c312", "8fb30ca22bfdc226d09fa8f9fa1a762aaf768475" ], "author": { "name": "Pawan Wagh", "email": "waghpawan@google.com", "time": "Fri Aug 30 16:27:25 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 16:27:25 2024 +0000" }, "message": "Merge \"Fuzzer seed corpus for vold\" into main am: 3348aec9b4 am: 8fb30ca22b\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3250239\n\nChange-Id: I3b625e1b5f82ab134c0ac288d24d451e71636678\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8fb30ca22bfdc226d09fa8f9fa1a762aaf768475", "tree": "a8de8c57a0ec46c8bdde76ab64d638ee5c1e9e09", "parents": [ "b63a554a5d60043b9b373ba7d924cc92cb63f1b5", "3348aec9b4446bdce5ae6b229b6a3bfa27f11e43" ], "author": { "name": "Pawan Wagh", "email": "waghpawan@google.com", "time": "Fri Aug 30 15:50:34 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 15:50:34 2024 +0000" }, "message": "Merge \"Fuzzer seed corpus for vold\" into main am: 3348aec9b4\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3250239\n\nChange-Id: I14e82db6a6eb032473e280a1a2f93c148b7356ea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3348aec9b4446bdce5ae6b229b6a3bfa27f11e43", "tree": "a8de8c57a0ec46c8bdde76ab64d638ee5c1e9e09", "parents": [ "f8e3b86cbd03af47c84d14230aabcb2a9c041fd0", "fa068e96538d97e041c8b030615c4bd5d090a52f" ], "author": { "name": "Pawan Wagh", "email": "waghpawan@google.com", "time": "Fri Aug 30 15:30:56 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 30 15:30:56 2024 +0000" }, "message": "Merge \"Fuzzer seed corpus for vold\" into main" }, { "commit": "fa068e96538d97e041c8b030615c4bd5d090a52f", "tree": "a8de8c57a0ec46c8bdde76ab64d638ee5c1e9e09", "parents": [ "f8e3b86cbd03af47c84d14230aabcb2a9c041fd0" ], "author": { "name": "Pawan Wagh", "email": "waghpawan@google.com", "time": "Thu Aug 29 19:48:01 2024 +0000" }, "committer": { "name": "Pawan Wagh", "email": "waghpawan@google.com", "time": "Thu Aug 29 19:48:01 2024 +0000" }, "message": "Fuzzer seed corpus for vold\n\nBug: 295220956\nTest: TH\nFlag: TEST_ONLY\nChange-Id: Iff9d17db6f32f5a98c4fb82153bd829ff19fc0a9\n" }, { "commit": "8c5dd6e9605e6b0672fb6b908591edcb8591fcc8", "tree": "608eeb119a6a2d8959de8dd359b83cf57a988679", "parents": [ "32fdcb87096e2a4684202221b1e660d215fadf6f" ], "author": { "name": "Daniel Rosenberg", "email": "drosen@google.com", "time": "Thu Jul 18 18:10:39 2024 -0700" }, "committer": { "name": "Daniel Rosenberg", "email": "drosen@google.com", "time": "Thu Aug 22 17:42:30 2024 -0700" }, "message": "Add timeout for mount on untrusted media\n\nUnder some circumstances it seems mounting a device can take a long\ntime. We already abort fsck if it runs for too long, so this is the last\nremaining spot this could happen.\n\nBug: 339740354\nTest: Mount a very slow device, observe no Android restart\nChange-Id: I3607be269d3aeb4c2391d1d8e2372e3a6795e7c4\n" }, { "commit": "1130dba5c98dfa492e791ee503bfaeb23122c312", "tree": "9b3a0a718c1229ef924b9cc3ac9304bfaa32b244", "parents": [ "92ce4d8138a47bc1bfb39b18954932ee3afe14f1", "b63a554a5d60043b9b373ba7d924cc92cb63f1b5" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Wed Aug 07 19:20:03 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 07 19:20:03 2024 +0000" }, "message": "Merge \"Remove unused static variable.\" into main am: f8e3b86cbd am: b63a554a5d\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3208316\n\nChange-Id: I3c0a72f31d99d8ba4cf8daea343f6f0852b37b5f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b63a554a5d60043b9b373ba7d924cc92cb63f1b5", "tree": "9b3a0a718c1229ef924b9cc3ac9304bfaa32b244", "parents": [ "3da0cf478c7dda60eeaa4fd2fd8c4a3bec642c08", "f8e3b86cbd03af47c84d14230aabcb2a9c041fd0" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Wed Aug 07 19:02:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 07 19:02:44 2024 +0000" }, "message": "Merge \"Remove unused static variable.\" into main am: f8e3b86cbd\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3208316\n\nChange-Id: I38a027977f45832ef5dc2090e4aca1eb881b6894\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f8e3b86cbd03af47c84d14230aabcb2a9c041fd0", "tree": "9b3a0a718c1229ef924b9cc3ac9304bfaa32b244", "parents": [ "03a059177ec42321e2c54f9fbe2b5c6706752217", "71aafb18f3685d8489648e163f253ff6684a85d9" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Wed Aug 07 18:27:52 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 07 18:27:52 2024 +0000" }, "message": "Merge \"Remove unused static variable.\" into main" }, { "commit": "92ce4d8138a47bc1bfb39b18954932ee3afe14f1", "tree": "3cc3aa21bca8878708548087eb698ecd180d30d8", "parents": [ "b8a0a0c2123291d38df1445dccc93baac7a352b7", "3da0cf478c7dda60eeaa4fd2fd8c4a3bec642c08" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Aug 07 00:40:14 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 07 00:40:14 2024 +0000" }, "message": "Merge \"Fix USB mount issue after GOTA upgrade\" into main am: 03a059177e am: 3da0cf478c\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3196519\n\nChange-Id: I6816b4c9ca5f922e7514a302e021df340c478ea6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3da0cf478c7dda60eeaa4fd2fd8c4a3bec642c08", "tree": "3cc3aa21bca8878708548087eb698ecd180d30d8", "parents": [ "2bba1dbe26870f0f4d9a78c3e68a92b75af30438", "03a059177ec42321e2c54f9fbe2b5c6706752217" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Aug 07 00:23:43 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 07 00:23:43 2024 +0000" }, "message": "Merge \"Fix USB mount issue after GOTA upgrade\" into main am: 03a059177e\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3196519\n\nChange-Id: I5342893a08a352978b8a4f2a2afdb6f1804e2c04\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "03a059177ec42321e2c54f9fbe2b5c6706752217", "tree": "3cc3aa21bca8878708548087eb698ecd180d30d8", "parents": [ "4f990d446f92e4011c73edda18ab5ebe908d35e2", "fd6b0c3a2328b8e36d93cbd837164382df651854" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Aug 06 23:56:33 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 06 23:56:33 2024 +0000" }, "message": "Merge \"Fix USB mount issue after GOTA upgrade\" into main" }, { "commit": "71aafb18f3685d8489648e163f253ff6684a85d9", "tree": "7051227f02a11dff8961f73832dbf5407fccdd19", "parents": [ "4f990d446f92e4011c73edda18ab5ebe908d35e2" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Sun Aug 04 03:38:29 2024 +0000" }, "committer": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Tue Aug 06 21:12:10 2024 +0000" }, "message": "Remove unused static variable.\n\nTest: Builds with -Wunused-variable\nChange-Id: I65c6dbad7fa075e912dbd63f871faf4c0a0c95fc\n" }, { "commit": "b8a0a0c2123291d38df1445dccc93baac7a352b7", "tree": "21ae4a69e1801853459be0d70de62cccf133b111", "parents": [ "6d3a2cc9051b665eeb43250136c89d54b42866a7", "2bba1dbe26870f0f4d9a78c3e68a92b75af30438" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Aug 05 19:47:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 05 19:47:10 2024 +0000" }, "message": "Merge \"fs: Ext4: Remove deprecated mount option\" into main am: 4f990d446f am: 2bba1dbe26\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3196672\n\nChange-Id: I157134364bf6a9e9deb8e937e9da50e68d7ef28e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2bba1dbe26870f0f4d9a78c3e68a92b75af30438", "tree": "21ae4a69e1801853459be0d70de62cccf133b111", "parents": [ "294b82ebf0415a00737cebc66da107ef6b937d08", "4f990d446f92e4011c73edda18ab5ebe908d35e2" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Aug 05 19:25:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 05 19:25:21 2024 +0000" }, "message": "Merge \"fs: Ext4: Remove deprecated mount option\" into main am: 4f990d446f\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3196672\n\nChange-Id: Iabf3ab0e0683af581e8d470e4cd63641ab4660a6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4f990d446f92e4011c73edda18ab5ebe908d35e2", "tree": "21ae4a69e1801853459be0d70de62cccf133b111", "parents": [ "2864a74fe4ead7974b4a1834c3b495a205fe1614", "2cab7d0891d0871d6ecc7fa934aee099022c7260" ], "author": { "name": "Eric Biggers", "email": "ebiggers@google.com", "time": "Mon Aug 05 19:11:24 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Aug 05 19:11:24 2024 +0000" }, "message": "Merge \"fs: Ext4: Remove deprecated mount option\" into main" }, { "commit": "2cab7d0891d0871d6ecc7fa934aee099022c7260", "tree": "21ae4a69e1801853459be0d70de62cccf133b111", "parents": [ "2864a74fe4ead7974b4a1834c3b495a205fe1614" ], "author": { "name": "Ilya Byckevich", "email": "byckevich.ilja@gmail.com", "time": "Fri Jul 26 21:14:05 2024 +0200" }, "committer": { "name": "Ilya", "email": "byckevich.ilja@gmail.com", "time": "Sat Aug 03 11:58:47 2024 +0000" }, "message": "fs: Ext4: Remove deprecated mount option\n\nMount option \"nomblk_io_submit\" was deleted from\nupstream kernel v3.9 in 36ade451a5d736e61ac8302b64aacc5acb5e440f\nand has not reappeared since then.\nNow it only generates \u0027Ignoring removed nomblk_io_submit option\u0027\nin the logs\n\nTest: manual\nChange-Id: I2100a681d34af827ea91a10b8435b16f5ac32358\n" }, { "commit": "fd6b0c3a2328b8e36d93cbd837164382df651854", "tree": "5991ba0e3959811b9a04e4d04c3fe484444b256a", "parents": [ "32fdcb87096e2a4684202221b1e660d215fadf6f" ], "author": { "name": "nick.liao", "email": "nick.liao@realtek.com", "time": "Mon Jul 29 10:03:28 2024 +0800" }, "committer": { "name": "nick.liao", "email": "nick.liao@realtek.com", "time": "Fri Aug 02 17:28:36 2024 +0800" }, "message": "Fix USB mount issue after GOTA upgrade\n\nAfter upgrading GOTA, the Netlink buffer size was too small to receive all uevents, resulting in the \"NetlinkListener: recvmsg failed (No buffer space available)\" error and increasing the chance of USB mount failure. Increased the Netlink buffer size to resolve this issue.\n\nTest Steps:\n1. Upgrade with GOTA.\n2. Reboot the system with the USB connected.\n3. Verify that the USB device is detected correctly.\n\nBug:355586244\n\nTEST: NA\nChange-Id: Ic2e01a44025868c1b2c0c72b9d3091bb2a356be2\n" }, { "commit": "6d3a2cc9051b665eeb43250136c89d54b42866a7", "tree": "fb89188a17ca5dbe73b24e0094b986391194fa63", "parents": [ "c997f99509c27d70dcb7884c0dae8f922786b17f", "294b82ebf0415a00737cebc66da107ef6b937d08" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Aug 02 01:17:39 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 02 01:17:39 2024 +0000" }, "message": "Merge \"Detect Encryption in Progress\" into main am: 2864a74fe4 am: 294b82ebf0\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3196967\n\nChange-Id: I8c5a94e3de4f3167bed5a07cbdbc40bdf86db2f2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "294b82ebf0415a00737cebc66da107ef6b937d08", "tree": "fb89188a17ca5dbe73b24e0094b986391194fa63", "parents": [ "40d48545e26329fede154052817df6ae8b77d4c3", "2864a74fe4ead7974b4a1834c3b495a205fe1614" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Aug 02 01:01:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 02 01:01:10 2024 +0000" }, "message": "Merge \"Detect Encryption in Progress\" into main am: 2864a74fe4\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3196967\n\nChange-Id: Ida24dfad7cfed863e031a9a6a6d695d86ab0fb51\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2864a74fe4ead7974b4a1834c3b495a205fe1614", "tree": "fb89188a17ca5dbe73b24e0094b986391194fa63", "parents": [ "32fdcb87096e2a4684202221b1e660d215fadf6f", "358487ace0701a845601c7140d790e79e330e22f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Aug 02 00:41:55 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 02 00:41:55 2024 +0000" }, "message": "Merge \"Detect Encryption in Progress\" into main" }, { "commit": "358487ace0701a845601c7140d790e79e330e22f", "tree": "fb89188a17ca5dbe73b24e0094b986391194fa63", "parents": [ "32fdcb87096e2a4684202221b1e660d215fadf6f" ], "author": { "name": "Daniel Rosenberg", "email": "drosen@google.com", "time": "Mon Jul 29 13:48:38 2024 -0700" }, "committer": { "name": "Daniel Rosenberg", "email": "drosen@google.com", "time": "Thu Aug 01 15:02:18 2024 -0700" }, "message": "Detect Encryption in Progress\n\nIf we\u0027re partially through setting up metadata encryption, failures\nleave the partition in a known bad state, and we can avoid an eventual\nboot into recovery by taking the wipe path.\n\nChange-Id: Id7a1c7d84c913469df542df7311a648c75d62f59\nBug: 351704691\nTest: Inserted debug code to reboot during initial encryption setup\n Verified device boots successfully on second attempt\n" }, { "commit": "c997f99509c27d70dcb7884c0dae8f922786b17f", "tree": "a14220ce73c2c24a6909c91ae1140cd64662a2e1", "parents": [ "72a950480f35e199cc3712c805096aec05a889f2", "40d48545e26329fede154052817df6ae8b77d4c3" ], "author": { "name": "Himanshu Gupta", "email": "himanshuz@google.com", "time": "Mon Jul 15 10:06:56 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 15 10:06:56 2024 +0000" }, "message": "Merge \"[CloneProfile] Create user mount directory before creating bind mounts.\" into main am: 32fdcb8709 am: 40d48545e2\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3075783\n\nChange-Id: I474788bee4cee012898d45749a89d9df7ee0221c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "40d48545e26329fede154052817df6ae8b77d4c3", "tree": "a14220ce73c2c24a6909c91ae1140cd64662a2e1", "parents": [ "c4da35e7117efe9e7ff376f83d9efa910c06c35e", "32fdcb87096e2a4684202221b1e660d215fadf6f" ], "author": { "name": "Himanshu Gupta", "email": "himanshuz@google.com", "time": "Mon Jul 15 09:53:34 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 15 09:53:34 2024 +0000" }, "message": "Merge \"[CloneProfile] Create user mount directory before creating bind mounts.\" into main am: 32fdcb8709\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3075783\n\nChange-Id: I32a2f33626ec4115df5c9d65995bb6d056851c09\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "32fdcb87096e2a4684202221b1e660d215fadf6f", "tree": "a14220ce73c2c24a6909c91ae1140cd64662a2e1", "parents": [ "d7db84a07434f34baab6935d9bf8fe738bc3832d", "4f17969a7f467636aa75df7f9aa4f271624ebb0b" ], "author": { "name": "Himanshu Gupta", "email": "himanshuz@google.com", "time": "Mon Jul 15 09:29:29 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 15 09:29:29 2024 +0000" }, "message": "Merge \"[CloneProfile] Create user mount directory before creating bind mounts.\" into main" }, { "commit": "4f17969a7f467636aa75df7f9aa4f271624ebb0b", "tree": "3e0f5e15965c73c81bbba0dd95cc38b40f95d908", "parents": [ "d38aa9fa0ae9c902bb47b6dabd0b8d1a48796934" ], "author": { "name": "Himanshu Gupta", "email": "himanshuz@google.com", "time": "Mon May 06 11:40:19 2024 +0100" }, "committer": { "name": "Himanshu Gupta", "email": "himanshuz@google.com", "time": "Fri Jul 12 16:39:22 2024 +0100" }, "message": "[CloneProfile] Create user mount directory before creating bind mounts.\n\nIn aosp/2679182 the capability to add bind mounts for clone user\nin public volumes was added.\nThis allows apps in clone profile to access public volume via lower\nfs.\nHowever, sometimes, the user mount directory (/user/mount/\u003cuser-id\u003e)\nis itself not present, resulting in failures of public volume\nbind mounts. This CL addresses this.\n\nBug: 327293687\nTest: Manul build and flash\nChange-Id: I0680a518cb14983c6f2e636a38ab6dcd476d7eab\n" }, { "commit": "72a950480f35e199cc3712c805096aec05a889f2", "tree": "fec5cf38bd2f96b0bd072ad0373b590d661b63fd", "parents": [ "d815f1afdbdfc0ab7b504e1f8d1675047b1f50e9", "c4da35e7117efe9e7ff376f83d9efa910c06c35e" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Jul 02 03:01:19 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jul 02 03:01:19 2024 +0000" }, "message": "Merge \"Add length parameter to format /data f2fs filesystem\" into main am: d7db84a074 am: c4da35e711\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3104682\n\nChange-Id: I02e7ad62acf3dbdcf1a6427ba1777246f887f4de\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c4da35e7117efe9e7ff376f83d9efa910c06c35e", "tree": "fec5cf38bd2f96b0bd072ad0373b590d661b63fd", "parents": [ "d815f1afdbdfc0ab7b504e1f8d1675047b1f50e9", "d7db84a07434f34baab6935d9bf8fe738bc3832d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Jul 02 02:43:44 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jul 02 02:43:44 2024 +0000" }, "message": "Merge \"Add length parameter to format /data f2fs filesystem\" into main am: d7db84a074\n\nOriginal change: https://android-review.googlesource.com/c/platform/system/vold/+/3104682\n\nChange-Id: I8d21e55bdffd35f201b7e532b207f8580c64bcce\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d7db84a07434f34baab6935d9bf8fe738bc3832d", "tree": "fec5cf38bd2f96b0bd072ad0373b590d661b63fd", "parents": [ "59cb8b37d07cd68e6896627d1015f97c59be0b21", "8a398788e40a780727709986dcdee3032d3dc813" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Jul 02 02:25:11 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 02 02:25:11 2024 +0000" }, "message": "Merge \"Add length parameter to format /data f2fs filesystem\" into main" } ], "next": "8a398788e40a780727709986dcdee3032d3dc813" }