summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Replace xargs with other shell commandKiyoung Kim2019-08-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | | | | | Snap for 5767086 from d941ba256f638c42b0f5ff630699fb745bf926f7 to ↵android-build-team Robot2019-07-311-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: Ib00f5d4f1ac489bb8a5d8a22f6601dc662201d54
| * | | | | | | Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into ↵Tri Vo2019-07-291-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-dev am: 184e9461c5 am: 92fa5730de Change-Id: I250988c152001140db969c2a3cd8e87bdbf45e0f
| | * | | | | | Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into qt-devTri Vo2019-07-291-0/+1
| |/| | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 184e9461c5 Change-Id: I9fc6de0a4f5608ae718e52b0806727bc44fbb688
| | * | | | | Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into qt-devTreeHugger Robot2019-07-301-0/+1
| | |\ \ \ \ \
| | | * | | | | VtsKernelMemInfoTest: only enforce on Q+ launching devicesTri Vo2019-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 135553509 Test: VtsKernelMemInfoTest Change-Id: I299d24623c363238e46229f8d09865e3afd6f9c0 Merged-In: I299d24623c363238e46229f8d09865e3afd6f9c0 (cherry picked from commit ad986341a44de776f3b0f1e140eb359754c45284)
* | | | | | | | Snap for 5733681 from 1674790b4cabab6cedc4dfefb9829f96ba8b6d5b to ↵android-build-team Robot2019-07-172-7/+187
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: Ic3fa62ffc38081759f80b3c833c5c7eeb45b54ae
| * | | | | | | Merge "usbd: Exit in case of charger mode." into qt-r1-devTreeHugger Robot2019-07-161-4/+3
| |\ \ \ \ \ \ \
| | * | | | | | | usbd: Exit in case of charger mode.Badhri Jagan Sridharan2019-07-161-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden" into qt-r1-devTreeHugger Robot2019-07-161-3/+184
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | fs_mgr: overlay: do not allow sub-mounts to be overriddenMark Salyzyn2019-07-151-3/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Snap for 5730547 from 0d9c4080f49e70c4e20f10ef235f29384aff991b to ↵android-build-team Robot2019-07-162-8/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: Ic5d9484bec5122e5bdc13b067e9c7dc8c227bdc0
| * | | | | | | | Merge "Reland "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" ↵Daniel Rosenberg2019-07-152-8/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qt-dev am: 11bf3545ab Change-Id: I9c7af0807d12ef60636d407fbba64ec664a7d31a
| | * | | | | | Merge "Reland "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" ↵Daniel Rosenberg2019-07-152-8/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into qt-dev
| | | * | | | | | Reland "Revert "rootdir / sdcard : Stop creating /data/media/obb.""Daniel Rosenberg2019-07-122-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Snap for 5726885 from e818cccd58f3c550ef92c8e0e9ddffbf8916c336 to ↵android-build-team Robot2019-07-134-37/+121
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I571deedb1a0159d6a1b9a51c2f28b81bc23fbc7d
| * | | | | | | | Merge "lmkd: Prevent non-main threads being registered or killed by lmkd" ↵Suren Baghdasaryan2019-07-121-0/+60
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qt-r1-dev
| | * | | | | | | | lmkd: Prevent non-main threads being registered or killed by lmkdSuren Baghdasaryan2019-07-121-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | | | | Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" ↵Gerry Fan2019-07-122-2/+8
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qt-dev am: ff7da227db Change-Id: I42b5fdcdb6b87afe44353d830f6b1b5c0c645fc0
| | * | | | | | | | Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" ↵Gerry Fan2019-07-122-2/+8
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | into qt-dev
| | | * | | | | | | Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""Gerry Fan2019-07-122-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 891a0113941136544509886c1638d973a6c9773c. Reason for revert: Some Test failed, need more investigation Bug: 136199978 Change-Id: Ibad0dad02a6701447c39ddcc805d44c9e68bdcce
| * | | | | | | | | Merge changes Ie0e6e716,I8adc169b into qt-r1-devChristopher Ferris2019-07-123-37/+61
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix error printing code. Cache only a small portion of page map data.
| | * | | | | | | | Fix error printing code.Christopher Ferris2019-07-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 135694447 Test: Induced error and verified the errors print properly in logcat. Change-Id: Ie0e6e71671a8a3e26b4632f93bb2af089a20e2e0 Merged-in: Ie0e6e71671a8a3e26b4632f93bb2af089a20e2e0 (cherry picked from commit d943301990367e81bd8752327f27827c9f2abba1)
| | * | | | | | | | Cache only a small portion of page map data.Christopher Ferris2019-07-113-37/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | | | | | | | Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-devHung-ying Tyan2019-07-122-8/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / / | | | | | | | | | | | | | | | | | | am: 346c17bbc9 Change-Id: I501695115c2c84345db0c78e8694fd31686b7ee7
| | * | | | | | | Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-devHung-ying Tyan2019-07-122-8/+2
| | |\| | | | | |
| | | * | | | | | Revert "rootdir / sdcard : Stop creating /data/media/obb."Gerry Fan2019-07-122-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c6ca823710d49754c3717e9cf3ba11b9c2648825. Reason for revert: Q-GSI on Pie devices would crash kernel. Bug: 136199978 Change-Id: I16a2cb81a1f21627db0cb00324679a322ba42fe0
* | | | | | | | | Snap for 5719381 from bb0838b5114419b4f8ecff67c0b6fb728399c7b7 to ↵android-build-team Robot2019-07-111-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I2d8f8e10162f876d23a573d1bf43f871e599224b
| * | | | | | | | rootdir: init.rc: use gc_urgent_sleep_time for f2fsJaegeuk Kim2019-07-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This accelerates f2fs GC when IdleMaint. Bug: 128594671 Bug: 137190790 Change-Id: I1cea7c99ffd5963711c66460f1c8368b43aeaee2 Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
* | | | | | | | | Snap for 5713042 from 8ba0b82605dc311ef2af59f9116f80212429d965 to ↵android-build-team Robot2019-07-091-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I8f99b217af6785a97974599d56b8ae1f5aeaa07c
| * | | | | | | | Avoid get same timestamps in log testcaseXu YiPing2019-07-081-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ac9e2af1b6 Change-Id: I1ec3face1c149dccedc59ef45fad2e7b73987cb7
| | * | | | | | | Avoid get same timestamps in log testcaseXu YiPing2019-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Snap for 5706813 from 41d77405d6e8bde886fab97e788759e37c30b49e to ↵android-build-team Robot2019-07-042-97/+184
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I2b2301fedcf0ef0a6ccf6b02c34df0a799481876
| * | | | | | | | dmabuf_dump: Change the default view to per-process statsSandeep Patil2019-07-012-42/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | | | dmabuf_dump: Fix aosp_x86-eng buildsSandeep Patil2019-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | | | dmabuf_dump: Make output more readable and debug friendlySandeep Patil2019-07-011-68/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | | | | | | | Snap for 5698755 from cac9a2b10bf269437490c40a5717fb2fb8cdb08c to ↵android-build-team Robot2019-06-292-34/+88
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: Ibf513d2d4a45f33afa8216a587bff3848c687944
| * | | | | | | | Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-devPaul Lawrence2019-06-272-34/+88
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: be4e6131d8 Change-Id: Ic522f20a8f1998ed63c90e0e2e6d469ef530b5f2
| | * | | | | | | Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-devTreeHugger Robot2019-06-272-34/+88
| | |\ \ \ \ \ \ \
| | | * | | | | | | Make ext4 userdata checkpoints work with metadata encryptionPaul Lawrence2019-06-272-34/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Snap for 5691478 from 8e3b94c2e296f1d23b49e1a61d20f3ebf8f417b5 to ↵android-build-team Robot2019-06-272-5/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I091613807dad197199709273960130fce78ae8fa
| * | | | | | | | | Fix IsUsable to check for each controller separatelySuren Baghdasaryan2019-06-262-5/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cb06c2b376 Change-Id: Id04ea4a5a208a307a7a2a3a6c801d38232921f36
| | * | | | | | | | Fix IsUsable to check for each controller separatelySuren Baghdasaryan2019-06-262-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | Snap for 5686022 from 5dd50fdb9c9386371d3ebafacb04c0270a80d455 to ↵android-build-team Robot2019-06-253-132/+120
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I3af64a5983084df6a1c4bd3a7088b8bbcf746644
| * | | | | | | | | Revert "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor"Dan Albert2019-06-241-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ba4684c2b2 Change-Id: Idd32e4c28031b07cda09477b819d4bce0434b4fb
| | * | | | | | | | Revert "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor"Dan Albert2019-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b2d79c5e48684d3859481bcca0e967fc4021db12. Bug: http://b/135753060 Test: treehugger Change-Id: I2b1b2b7dfb7bab783e4ed40e295329525ceaa0dd
| * | | | | | | | | Revert "adb: turn CHECKs into an error + transport restart."Dan Albert2019-06-241-20/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2547f740ea Change-Id: Ic4ab7cf01bc53ece9f5459e60a7ba602ec086ef0
| | * | | | | | | | Revert "adb: turn CHECKs into an error + transport restart."Dan Albert2019-06-241-20/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b41d7ae1a9e5cfd2a7df6d0edee50fdf97c636f0. Bug: http://b/135753060 Test: treehugger Change-Id: Ib7cd7b7eaffa55ec2884a096a1c11739b12af6d1
| * | | | | | | | | Revert "Reland "adbd: don't close ep0 until we receive FUNCTIONFS_UNBIND.""Dan Albert2019-06-243-111/+112
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 782036b7af Change-Id: I73978ff63b91e14f79a719d0aec1ee7812749b2d
| | * | | | | | | | Revert "Reland "adbd: don't close ep0 until we receive FUNCTIONFS_UNBIND.""Dan Albert2019-06-243-111/+112
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c33aee8ac1c0958df32dcd2db27ca3d0d1badbd1. Bug: http://b/135753060 Test: treehugger Change-Id: Ic83a44e7c8f860a6c044ca20ec81f365a8a6ba4b