summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-01Snap for 5910486 from aebebeb92311f9867200238835eb0aced259a8b7 to ↵android-mainline-10.0.0_r4android10-qpr1-mainline-releaseandroid-build-team Robot
qt-qpr1-aml-release Change-Id: I78bd7ca5c82d1ae62f3af7ef7b50096ecb9840ab
2019-09-27fs_mgr: run fsck.f2fs with -f option when full mount failsSahitya Tummala
There are cases where fsck.f2fs -f helps to recover from corruption and thus helps to mount f2fs successfully. Bug: 141693451 Bug: 141601405 CRs-Fixed: 2458080 Merged-In: I8d91835e464ef86e6ad4f96b7ac83f9f3d57c14f Change-Id: I8d91835e464ef86e6ad4f96b7ac83f9f3d57c14f
2019-09-17Create /data/per_bootPaul Crowley
Bug: 140882488 Test: Booted twice, checked logs to ensure encryption is different each time, adb created files in directory. Cherry-Picked-From: 570d20d2ac875198416dff280b7a4b7adaacac81 Merged-In: I44f746acd1040f7baa9123d4824ba39b194f287b Change-Id: I44f746acd1040f7baa9123d4824ba39b194f287b
2019-08-28init: boot into thermal shutdown target on supported devicesWei Wang
Bug: 137982557 Test: thermal shutdown Change-Id: I4c7c4647e340be6be7a37a3dde6324b4d7903007
2019-08-02Replace xargs with other shell commandKiyoung Kim
Recently Android build team changed environment to use prebuilt toybox binaries for common tools (aosp/852849). However, as toybox xargs does not support -I option, update_and_install_ld_config.mk started to fail filtering out private vndk libraries from the list. To resolve this, xargs usages are replaced with other shell command (read). Bug: 137832162 Test: m -j && tested on Cuttlefish Change-Id: I218ce6272c781f826b87c8efc0d3c77bf6bc3af5 Merged-In: I218ce6272c781f826b87c8efc0d3c77bf6bc3af5 (cherry picked from commit 95d55818a46d793295db5e90fa55fd0b01bed059)
2019-07-29Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into ↵Tri Vo
qt-dev am: 184e9461c5 am: 92fa5730de Change-Id: I250988c152001140db969c2a3cd8e87bdbf45e0f
2019-07-29Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into qt-devTri Vo
am: 184e9461c5 Change-Id: I9fc6de0a4f5608ae718e52b0806727bc44fbb688
2019-07-30Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into qt-devTreeHugger Robot
2019-07-25VtsKernelMemInfoTest: only enforce on Q+ launching devicesTri Vo
Bug: 135553509 Test: VtsKernelMemInfoTest Change-Id: I299d24623c363238e46229f8d09865e3afd6f9c0 Merged-In: I299d24623c363238e46229f8d09865e3afd6f9c0 (cherry picked from commit ad986341a44de776f3b0f1e140eb359754c45284)
2019-07-16Merge "usbd: Exit in case of charger mode." into qt-r1-devTreeHugger Robot
2019-07-16Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden" into qt-r1-devTreeHugger Robot
2019-07-16usbd: Exit in case of charger mode.Badhri Jagan Sridharan
UsbGadget hal is not expected run in charger mode. This should fix the following errors in charger mode: [ 86.609578] c4 612 init: Received control message 'interface_start' for 'android.hardware.usb.gadget@1.0::IUsbGadget/default' from pid: 565 (/system/bin/hwservicemanager) [ 86.618236] c7 1 init: Could not find 'android.hardware.usb.gadget@1.0::IUsbGadget/default' for ctl.interface_start Bug: 135566354 Test: Manually verified that usbd exits early in charger mode. Change-Id: I3ba5be883c49e5ca3e4dad4443528e4eee8b25b9 Merged-In: I3ba5be883c49e5ca3e4dad4443528e4eee8b25b9
2019-07-15Merge "Reland "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" ↵Daniel Rosenberg
into qt-dev am: 11bf3545ab Change-Id: I9c7af0807d12ef60636d407fbba64ec664a7d31a
2019-07-15Merge "Reland "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" ↵Daniel Rosenberg
into qt-dev
2019-07-15fs_mgr: overlay: do not allow sub-mounts to be overriddenMark Salyzyn
Prevent sub-mounts from being candidates for overlayfs overrides. We move them temporarily to hold the references, then move them back after overlayfs mount. There is a race condition that can not be solved where the content of the sub-mount is temporarily unavailable. This operation occurs in first stage init (no problem) and during the first adb remount or adb disable-verity that causes the backing storage to be setup. Workaround will be to time the adb remount/disable-verity so that the device-specific problems do not surface. Test: adb-remount-test.sh and manual device configs Bug: 130131892 Bug: 135647457 Merged-In: I8782d09b7b389d899aed07b3e6c528280af2d6c8 Change-Id: I8782d09b7b389d899aed07b3e6c528280af2d6c8
2019-07-12Reland "Revert "rootdir / sdcard : Stop creating /data/media/obb.""Daniel Rosenberg
This reverts commit 997a2d93d7a9216c248be9c983adec2d91283f5a. Reason for revert: This revert is needed, just also need some selinux rules for changes to the script that runs if this folder is present. Bug: 136199978 Change-Id: Ie0544954965e3c90abc2f833c41949976c3bea65
2019-07-12Merge "lmkd: Prevent non-main threads being registered or killed by lmkd" ↵Suren Baghdasaryan
into qt-r1-dev
2019-07-12Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" ↵Gerry Fan
into qt-dev am: ff7da227db Change-Id: I42b5fdcdb6b87afe44353d830f6b1b5c0c645fc0
2019-07-12Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" ↵Gerry Fan
into qt-dev
2019-07-12Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""Gerry Fan
This reverts commit 891a0113941136544509886c1638d973a6c9773c. Reason for revert: Some Test failed, need more investigation Bug: 136199978 Change-Id: Ibad0dad02a6701447c39ddcc805d44c9e68bdcce
2019-07-12Merge changes Ie0e6e716,I8adc169b into qt-r1-devChristopher Ferris
* changes: Fix error printing code. Cache only a small portion of page map data.
2019-07-12lmkd: Prevent non-main threads being registered or killed by lmkdSuren Baghdasaryan
Only thread group leaders should be registered with lmkd. Add a check to ignore any non-leader TIDs and generate an error if such condition is detected. Run the same check before killing a process to detect cases of non-leader TIDs being used to kill a process. This might happen if PIDs overflow and previously registered PID gets reused for a non-leader thread in the following scenario: 1. pid X is a thread group leader and is registered with lmkd 2. pid X dies without lmkd knowing it and pid gets recycled 3. process Y creates a thread with tid X 4. lmkd kills pid X which results in process Y being killed Bug: 136408020 Test: lmkd_unit_test Change-Id: I46c5a0b273f2b72cefc20ec59b80b4393f2a1a37 Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-07-12Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-devHung-ying Tyan
am: 346c17bbc9 Change-Id: I501695115c2c84345db0c78e8694fd31686b7ee7
2019-07-12Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-devHung-ying Tyan
2019-07-12Revert "rootdir / sdcard : Stop creating /data/media/obb."Gerry Fan
This reverts commit c6ca823710d49754c3717e9cf3ba11b9c2648825. Reason for revert: Q-GSI on Pie devices would crash kernel. Bug: 136199978 Change-Id: I16a2cb81a1f21627db0cb00324679a322ba42fe0
2019-07-11Fix error printing code.Christopher Ferris
Bug: 135694447 Test: Induced error and verified the errors print properly in logcat. Change-Id: Ie0e6e71671a8a3e26b4632f93bb2af089a20e2e0 Merged-in: Ie0e6e71671a8a3e26b4632f93bb2af089a20e2e0 (cherry picked from commit d943301990367e81bd8752327f27827c9f2abba1)
2019-07-11Cache only a small portion of page map data.Christopher Ferris
The scudo memory allocator will allocate a large virtual memory address that causes procrank to allocate a huge amount of data. Modify so it caches the data a bit at a time. Remove some allocations that are not necessary since the data is only used in the first loop. Fix a few pread64 checks against the actual bytes read, rather than the read is < 0. Fix sort by rss in procrank. Bug: 135694447 Test: Ran unit tests (only one unit test actually runs the modified code). Test: Ran the old version of procrank using a static libmeminfo and verified Test: that the same data is found as the new version. Change-Id: I8adc169b5607ec994ff13a9e161a479350d84c4d Merged-In: I8adc169b5607ec994ff13a9e161a479350d84c4d (cherry picked from commit 7f8915c76e232dd228930e749ec289d10c547f85)
2019-07-10rootdir: init.rc: use gc_urgent_sleep_time for f2fsJaegeuk Kim
This accelerates f2fs GC when IdleMaint. Bug: 128594671 Bug: 137190790 Change-Id: I1cea7c99ffd5963711c66460f1c8368b43aeaee2 Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2019-07-08Avoid get same timestamps in log testcaseXu YiPing
am: ac9e2af1b6 Change-Id: I1ec3face1c149dccedc59ef45fad2e7b73987cb7
2019-07-08Avoid get same timestamps in log testcaseandroid-cts-10.0_r2android10-devXu YiPing
for arm64, userspace get time by vDSO, no syscall overhead. multiple_test_2 sometimes get 2 same timestamps now, then testcase fails. Bug: b/135555666 Test: ./CtsLogdTestCases64 --gtest_filter=*multiple_test* Merged-In: Ic8a0ab6f571df1487fe5fb4e5f07dc612af69001 Change-Id: I83f8beae168f397a347972c5e60de86d16c8f7c6
2019-07-01dmabuf_dump: Change the default view to per-process statsSandeep Patil
Add '-a' commandline option to show the old complete table that shows dmabuf x process grid. Fixes: 135668399 Test: dmabuf_dump Test: dmabuf_dump -h Test: dmabuf_dump -a Test: dmabuf_dump -a 123 Test: dmabuf_dump 123 456 Test: dmabuf_dump <pid> Change-Id: If228c97baa375c515d94baf3b5be674cfcc09919 Merged-In: If228c97baa375c515d94baf3b5be674cfcc09919 Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-07-01dmabuf_dump: Fix aosp_x86-eng buildsSandeep Patil
Test: lunch aosp_x86-eng; mma -j Test: lunch aosp_blueline-eng; mma -j Bug: 136136199 Change-Id: Ie6f90c967b356a55db09acee7b3596661e001166 Merged-In: Ie6f90c967b356a55db09acee7b3596661e001166 Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-07-01dmabuf_dump: Make output more readable and debug friendlySandeep Patil
- Get rid of the PSS number that didn't make sense. - Fix double counting in per-process size when buffers had file descriptors and mmap'ed - Make the output much more readable - Print totals where they make sense. - Dont print per-process fd and map refs separately, total ref count per process is sufficient. Bug: 135668399 Test: dmabuf_dump (on AOSP blueline) Change-Id: I10dc0a332d49110dd68f0eaa94a326679361deea Merged-In: I10dc0a332d49110dd68f0eaa94a326679361deea Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-06-27Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-devPaul Lawrence
am: be4e6131d8 Change-Id: Ic522f20a8f1998ed63c90e0e2e6d469ef530b5f2
2019-06-27Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-devTreeHugger Robot
2019-06-27Make ext4 userdata checkpoints work with metadata encryptionPaul Lawrence
When both ext4 user data checkpoints and metadata encryption are enabled, we are creating two stacked dm devices. This had not been properly thought through or debugged. Test: Enable metadata encryption on taimen (add keydirectory=/metadata/vold/metadata_encryption to flags for userdata in fstab.hardware) Unfortunately metadata is not wiped by fastboot -w, so it is necessary to rm metadata/vold -rf whenever you wipe data. fastboot flashall -w works fastboot reboot -w works A normal boot works Disable checkpoint commits with setprop persist.vold.dont_commit_checkpoint 1 vdc checkpoint startCheckpoint 10 adb reboot wait for device to fully boot then adb reboot Wait for device to fully boot then adb logcat -d | grep Checkpoint shows the rollback in the logs This tests encryption on top of checkpoints with commit, encryption without checkpoints, and rollback, which seems to be the key cases. Also ran same tests on unmodified Taimen and Blueline Bug: 135905679 Merged-In: I24387a2943dce28b918c34894f24911b20429be7 Change-Id: I24387a2943dce28b918c34894f24911b20429be7
2019-06-26Fix IsUsable to check for each controller separatelySuren Baghdasaryan
am: cb06c2b376 Change-Id: Id04ea4a5a208a307a7a2a3a6c801d38232921f36
2019-06-26Fix IsUsable to check for each controller separatelySuren Baghdasaryan
CgroupController::IsUsable is using a global static variable to store the existence of the controller. That means the first controller existence check would affect all other controllers. Fix this by making this variable to be a member of CgroupController class so that each controller can check for its existence independently of other controllers. Fixes: aa1d54f0ccbb ("Remove ACgroupController_getFlags to fix API breakage") Bug: 136020193 Test: adb shell cat /proc/$pid/task/*/cgroup" prints "cpuset:/top-app" Test: for new launched activity process Change-Id: I4741a9126ea494122d5b2b1a0c4d7252bff6025c Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-06-24Revert "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor"Dan Albert
am: ba4684c2b2 Change-Id: Idd32e4c28031b07cda09477b819d4bce0434b4fb
2019-06-24Revert "adb: turn CHECKs into an error + transport restart."Dan Albert
am: 2547f740ea Change-Id: Ic4ab7cf01bc53ece9f5459e60a7ba602ec086ef0
2019-06-24Revert "Reland "adbd: don't close ep0 until we receive FUNCTIONFS_UNBIND.""Dan Albert
am: 782036b7af Change-Id: I73978ff63b91e14f79a719d0aec1ee7812749b2d
2019-06-24Revert "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor"Dan Albert
This reverts commit b2d79c5e48684d3859481bcca0e967fc4021db12. Bug: http://b/135753060 Test: treehugger Change-Id: I2b1b2b7dfb7bab783e4ed40e295329525ceaa0dd
2019-06-24Revert "adb: turn CHECKs into an error + transport restart."Dan Albert
This reverts commit b41d7ae1a9e5cfd2a7df6d0edee50fdf97c636f0. Bug: http://b/135753060 Test: treehugger Change-Id: Ib7cd7b7eaffa55ec2884a096a1c11739b12af6d1
2019-06-24Revert "Reland "adbd: don't close ep0 until we receive FUNCTIONFS_UNBIND.""Dan Albert
This reverts commit c33aee8ac1c0958df32dcd2db27ca3d0d1badbd1. Bug: http://b/135753060 Test: treehugger Change-Id: Ic83a44e7c8f860a6c044ca20ec81f365a8a6ba4b
2019-06-21Merge changes Ibb3f46b8,I875b87a0,I2d005e17 into qt-devJosh Gao
am: 64e64eb990 Change-Id: I9541e903885ed2fd5fc1b431f881d4aa33f03411
2019-06-22Merge changes Ibb3f46b8,I875b87a0,I2d005e17 into qt-devJosh Gao
* changes: Reland "adbd: don't close ep0 until we receive FUNCTIONFS_UNBIND." adb: turn CHECKs into an error + transport restart. adb: daemon: Assign valid fd to usb_handle ep0 file descriptor
2019-06-21Merge "fs_mgr: overlay: only use system_<other> if other slot suffix not ↵David Anderson
blank" into qt-dev am: e8d1fac1a6 Change-Id: I8d2a6dcca3df75e44a67e8f7e184d52a6558e1a5
2019-06-22Merge "fs_mgr: overlay: only use system_<other> if other slot suffix not ↵David Anderson
blank" into qt-dev
2019-06-21Reland "adbd: don't close ep0 until we receive FUNCTIONFS_UNBIND."Josh Gao
Read until we receive FUNCTIONFS_BIND after every USB descriptor setup, instead of only after initial creation of the control fd, so we properly handle a rebind caused by a change of the USB configuration. This reverts commit 55b31933f41b1c550b788fa2054010c51f56111b. Bug: http://b/133132986 Bug: http://b/135155652 Test: manually enabled/disabled MTP with nonblocking_ffs enabled and disabled Change-Id: Ibb3f46b8f84854ede47a669a85e07e16a5dd6008 Merged-In: Ibb3f46b8f84854ede47a669a85e07e16a5dd6008 (cherry picked from commit b00e66f754d6cfe2c5dcd7dab54a4a86004effd7)
2019-06-21[automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 am: bdc924f31d ↵Janis Danisevskis
am: 7535975701 am: e126026c02 am: 4ae4ad8e5b am: b25983460c am: 20e73e23c4 am: ca662c7118 am: 14d1d6add8 am: 4ea7584d34 Change-Id: I6c0c79a772b9114b84a0fbfd37a65fd6648f2660
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 05:55:57 +0000