OSDN Git Service
Chih-Wei Huang [Tue, 10 Mar 2020 04:37:30 +0000 (12:37 +0800)]
Merge tag 'android-10.0.0_r32' into q-x86
Android 10.0.0 Release 32 (QQ2A.200305.004.A1)
Chih-Wei Huang [Wed, 15 Jan 2020 08:48:22 +0000 (16:48 +0800)]
Fix ro.build.fingerprint
Fix mismatched fingerprints, a stupid bug of Android 10.
Chih-Wei Huang [Fri, 3 Jan 2020 12:02:25 +0000 (20:02 +0800)]
sdcard: add back fuse support
We need fuse on tmpfs.
android-build-team Robot [Sat, 21 Dec 2019 02:07:36 +0000 (02:07 +0000)]
Snap for
6091187 from
96d6745fe4dd110d2f23e3811e36c798a75dd2a7 to qt-qpr2-release
Change-Id: I3a07180a2f4f79d388c3d471a3bb08405c6fea48
Gavin Corkery [Tue, 10 Dec 2019 23:00:24 +0000 (23:00 +0000)]
Store crashing process name in sysprop
As part of Watchdog-triggered rollback logging, it would
be useful to know the service which has caused
updatable_crashing to be set. Store this in a new property
ro.init.updatable_crashing_process_name.
Test: manual
Bug:
146415463
Change-Id: Iffa38b2b746abbb5d823a8d69b7b8d2456836f4e
Merged-In: Iffa38b2b746abbb5d823a8d69b7b8d2456836f4e
(cherry picked from commit
5d0deb563d252ab41ea9fc0107477a6b738afbb9)
android-build-team Robot [Thu, 19 Dec 2019 02:13:39 +0000 (02:13 +0000)]
Snap for
6083172 from
a8a3e4ccf97111fe9ba87176a67daf95d0df84a4 to qt-qpr2-release
Change-Id: I2cd3b46f9b41390b1bd9c645362609b8d1636237
Chih-Wei Huang [Wed, 11 Dec 2019 08:58:24 +0000 (16:58 +0800)]
libcutils: add probe_module
The functions are used by several modules of Android-x86.
Chih-Wei Huang [Sat, 23 Nov 2019 07:39:21 +0000 (15:39 +0800)]
init: set default selinux mode to permissive
To support selinux enforcing mode, we still have a long way to go.
Let's set the default mode to permissive.
Chih-Wei Huang [Sat, 23 Nov 2019 01:30:10 +0000 (09:30 +0800)]
init: set ro.boot.hardware to product name
We don't set androidboot.hardware cmdline anymore.
Michael Goffioul [Fri, 4 Oct 2019 14:48:44 +0000 (10:48 -0400)]
ueventd: log to /dev/kmsg
Michael Goffioul [Sun, 29 Sep 2019 00:32:44 +0000 (20:32 -0400)]
ueventd: auto load modules on uevents
Chih-Wei Huang [Tue, 26 Feb 2019 15:14:59 +0000 (23:14 +0800)]
Software-accelerated Pixel Flinger
The typical graphic workloads on VirtualBox are improved 3X.
Supports both x86 and x86_64.
Similar change by HazouPH <jgrharbers@gmail.com>:
http://review.cyanogenmod.org/#/c/70896/
And by Quanganh pham <quanganh2627@gmail.com>:
http://review.cyanogenmod.org/#/c/97125/
Change-Id: I652bfd84bc219b918f94ca8371bb8eb8ba734fe3
Chih-Wei Huang [Fri, 25 May 2018 10:27:22 +0000 (18:27 +0800)]
logd: show the concrete error if cap_set_proc fails
Chih-Wei Huang [Wed, 13 Dec 2017 06:57:06 +0000 (14:57 +0800)]
ueventd: fix the buggy logging
LOG(xxx) is totally broken. Use KLOG_xxx to actually show the log.
Chih-Wei Huang [Mon, 20 Nov 2017 08:50:20 +0000 (16:50 +0800)]
init: handle ctrl-alt-del event
By setting /proc/sys/kernel/ctrl-alt-del to 1, kernel will trap
ctrl-alt-del event and send a SIGINT signal to init.
Start the ctrl-alt-del service on receiving the signal.
Chih-Wei Huang [Tue, 12 Sep 2017 08:22:04 +0000 (16:22 +0800)]
init: don't bail out even no SELinux domain defined
Chih-Wei Huang [Fri, 29 Jul 2016 11:49:58 +0000 (19:49 +0800)]
init.rc: symlink /lib to /system/lib
Currently more linux drivers use request_firmware_nowait() to load
firmwares. It requires the firmwares exist in the standard path.
Create the symlink before ueventd started to ensure firmwares
could be loaded correctly.
Ma Jian [Sun, 12 Jun 2016 09:34:25 +0000 (17:34 +0800)]
Support use local time for RTC
When default timezone isn't UTC, there will no persist.sys.timezone
under /data/property/, so init won't get the default timezone for
setting time from rtc.
This change adds a fallback to read the property when the persist file
does not exists.
Notice, the default property of persist.sys.timezone should be set in
/default.prop instead of /system/build.prop
NO_REF_TASK
Tested: set default timezone with Asia/Shanghai, make sure bios time
is correct in local time, reboot to android, the local time should
be correct.
Change-Id: Ifbd20cb3710f833ab65852b4e5d51e38cc7c2d79
Roman Petrovski [Fri, 10 Jun 2016 19:50:00 +0000 (03:50 +0800)]
init: support usbmisc devices
The patch allows to create usbmisc device nodes like /dev/cdc-wdm0.
Ching Tzung Lin [Mon, 11 Jan 2016 21:00:22 +0000 (13:00 -0800)]
Mount debugfs earlier regardless build variant
ag/835596 can be reverted after this CL is merged.
BUG:
26455292
Change-Id: I453b0f1d08d822f8cd2d4d33f1c1b21f0d7f543a
Chih-Wei Huang [Mon, 23 Nov 2015 09:57:37 +0000 (17:57 +0800)]
init: expand variables on mount_all command
This allows mount_all to handle fstab.${ro.hardware} instead
of hardcoding the file name.
Change-Id: Ia7fb4e5a84dd50a46afdd4239b9b06204f449cfe
Andrew Boie [Fri, 11 Nov 2011 01:58:05 +0000 (17:58 -0800)]
diskconfig: Fix disk_layout.conf size parsing
If the user was appending 'K' to their lengths (which is valid
but redundant) it was being treated as megabytes instead of
kilobytes.
Change-Id: I979ec4d01f1342de1f3209b946201ca87bad32a7
Paul Drews [Mon, 20 Jun 2011 17:01:24 +0000 (10:01 -0700)]
Use progressive offset in buffer for successive writes
The code for copying from one raw file to another looped
back and tried again with a suitably smaller number of bytes
if the entire buffer was not written on the first try.
However, it failed to advance an offset in the buffer past
the bytes that were written. This could conceivably happen
under rare circumstances, leading to a corrupted disk image.
This fix defines an offset into the buffer, advancing it by
the number of bytes written on each successive retry.
Signed-off-by: Paul Drews <paul.drews@intel.com>
Change-Id: I76b8e0b3c0d3b0c32bd2114d0867ac7489808279
Andrew Boie [Wed, 11 Jul 2012 03:43:29 +0000 (20:43 -0700)]
libdiskconfig: HACK Don't do space checks on zero-size images
If an image file is of zero size, assume we just want to expand it
to fit the available images.
Change-Id: If8f22eb12d3a5179960d4359307bb177e3323e8a
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Chih-Wei Huang [Mon, 3 Nov 2014 15:06:02 +0000 (23:06 +0800)]
Allow all to execute su
Let the Superuser app control how su is used.
Chih-Wei Huang [Wed, 29 Oct 2014 15:25:57 +0000 (23:25 +0800)]
init.rc: run the console shell as root
To make debugging easier.
Chih-Wei Huang [Fri, 8 Aug 2014 10:17:04 +0000 (18:17 +0800)]
libutils: fix incorrect calculation in utf8_length() method
The first character of utf-8 could be larger than 128. If use signed char
variable to hold it, it would be treated as negative. That may result in
some unexpected errors.
For example, without this patch, suppose the code is 0xE88888, then
first_char is 0xE8 and converted to int32_t type (0xFFFFFFE8) and
masked with (~to_ignore_mask). The result utf32 is
FFF08208
which is incorrect.
Change-Id: I72b355f380865bc375251eb287fc225fd585a115
Chih-Wei Huang [Tue, 1 Feb 2011 07:47:03 +0000 (15:47 +0800)]
init: change firmware_dirs for Android-x86
Bowgo Tsai [Wed, 11 Dec 2019 07:14:00 +0000 (15:14 +0800)]
Allowing /avb/q-developer-gsi.avbpubkey for DSU
Adding the key to allow a device boot a Q-Deverloper-GSI.
Bug:
144399552
Test: boots a developer Q-GSI on a Pixel device
Change-Id: If79149689afd4b662c4cae3a8b48e3a5dc57d00c
Merged-In: I6bc1e068368e64cb0bbf6ef63805444b35a1fdfb
Bowgo Tsai [Tue, 10 Dec 2019 04:35:59 +0000 (12:35 +0800)]
Adding the AVB public key for Q-Developer-GSI
Bug:
144399552
Test: m q-developer-gsi.avbpubkey
Change-Id: If140c429c8b8324c0c2364aa67e72e41748b42b4
Merged-In: If140c429c8b8324c0c2364aa67e72e41748b42b4
(cherry picked from commit
bd0853602b9d82398290d9c30a5259b8f8db6c79)
android-build-team Robot [Sun, 10 Nov 2019 00:13:50 +0000 (00:13 +0000)]
Snap for
5998981 from
81303e4c8f3889857925d4253a8a134d088a13a0 to qt-qpr2-release
Change-Id: I0cba8c4e1d1a0d2f1ac419f174e63c6a7a7dfd5a
Steven Moreland [Thu, 7 Nov 2019 00:32:08 +0000 (16:32 -0800)]
FlattenableUtils::align memsets am:
e62a9d7669 am:
59e7d4e8ea am:
3f273f49f1 am:
f7724dfcfb am:
4392bca7f7
am:
80965d4ee9
Change-Id: Ic58551fdd717a31b71831dfe1c39a970700edf7c
Steven Moreland [Thu, 7 Nov 2019 00:26:06 +0000 (16:26 -0800)]
FlattenableUtils::align memsets am:
e62a9d7669 am:
59e7d4e8ea am:
3f273f49f1 am:
f7724dfcfb
am:
4392bca7f7
Change-Id: I0d51ef04b0641889117054cc36499acdbac83220
Steven Moreland [Thu, 7 Nov 2019 00:19:08 +0000 (16:19 -0800)]
FlattenableUtils::align memsets am:
e62a9d7669 am:
59e7d4e8ea am:
3f273f49f1
am:
f7724dfcfb
Change-Id: I0ecdb9a58418d0c65629c70fc6df2a4aad7a1784
Steven Moreland [Thu, 7 Nov 2019 00:13:06 +0000 (16:13 -0800)]
FlattenableUtils::align memsets am:
e62a9d7669 am:
59e7d4e8ea
am:
3f273f49f1
Change-Id: I91a8ef78619709fcdcb48cdad8e0e7a6b699b631
Steven Moreland [Thu, 7 Nov 2019 00:06:57 +0000 (16:06 -0800)]
FlattenableUtils::align memsets am:
e62a9d7669
am:
59e7d4e8ea
Change-Id: I1105027b52c3621e2031bdb747de61ce54d3ec74
Steven Moreland [Wed, 6 Nov 2019 23:55:08 +0000 (15:55 -0800)]
FlattenableUtils::align memsets
am:
e62a9d7669
Change-Id: I51a5528d8544f374ff3ceb632e75a1d3ae97d963
Steven Moreland [Tue, 8 Oct 2019 00:31:17 +0000 (17:31 -0700)]
FlattenableUtils::align memsets
Bug:
141890807
Test: boot, check data is zero'd
Change-Id: I45aaeac369f4c5cf3eb44f61c233e00f870a5c79
(cherry picked from commit
bf824f8fa50d9f7390057278fefb58e83323a644)
android-build-team Robot [Sat, 28 Sep 2019 23:14:53 +0000 (23:14 +0000)]
Snap for
5907400 from
aebebeb92311f9867200238835eb0aced259a8b7 to qt-qpr1-release
Change-Id: Idd42e02b47610b4cadfe10ba06af2396f57dc147
Sahitya Tummala [Thu, 23 May 2019 10:53:58 +0000 (16:23 +0530)]
fs_mgr: run fsck.f2fs with -f option when full mount fails
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
android-build-team Robot [Thu, 19 Sep 2019 03:07:53 +0000 (03:07 +0000)]
Snap for
5885124 from
04908a85f0a60dd7ac7bcbe9bf79b8c3ce4e20c9 to qt-qpr1-release
Change-Id: I3800a623da88d8b601d6a25e6dbd55babd1a4040
Paul Crowley [Wed, 11 Sep 2019 22:02:44 +0000 (15:02 -0700)]
Create /data/per_boot
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
android-build-team Robot [Sat, 7 Sep 2019 23:17:14 +0000 (23:17 +0000)]
Snap for
5860054 from
271014e8325f17ac1fcf83dede7ce987c293fb2c to qt-qpr1-release
Change-Id: Id2b5606023752261dc90ad321b522ef0914fb69d
Wei Wang [Tue, 27 Aug 2019 23:35:35 +0000 (16:35 -0700)]
init: boot into thermal shutdown target on supported devices
Bug:
137982557
Test: thermal shutdown
Change-Id: I4c7c4647e340be6be7a37a3dde6324b4d7903007
android-build-team Robot [Sat, 3 Aug 2019 23:12:25 +0000 (23:12 +0000)]
Snap for
5778794 from
1d85de658cdf882f367c485feb9d5ef5f87b14f0 to qt-qpr1-release
Change-Id: Ie812697812e1d0b5000b4be96f0bc081e0d7db93
Kiyoung Kim [Thu, 18 Jul 2019 11:21:05 +0000 (20:21 +0900)]
Replace xargs with other shell command
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)
android-build-team Robot [Wed, 31 Jul 2019 03:03:07 +0000 (03:03 +0000)]
Snap for
5767086 from
d941ba256f638c42b0f5ff630699fb745bf926f7 to qt-qpr1-release
Change-Id: Ib00f5d4f1ac489bb8a5d8a22f6601dc662201d54
Tri Vo [Tue, 30 Jul 2019 01:57:41 +0000 (18:57 -0700)]
Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into qt-dev am:
184e9461c5
am:
92fa5730de
Change-Id: I250988c152001140db969c2a3cd8e87bdbf45e0f
Tri Vo [Tue, 30 Jul 2019 01:48:20 +0000 (18:48 -0700)]
Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into qt-dev
am:
184e9461c5
Change-Id: I9fc6de0a4f5608ae718e52b0806727bc44fbb688
TreeHugger Robot [Tue, 30 Jul 2019 01:07:45 +0000 (01:07 +0000)]
Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into qt-dev
Tri Vo [Wed, 24 Jul 2019 00:06:52 +0000 (17:06 -0700)]
VtsKernelMemInfoTest: only enforce on Q+ launching devices
Bug:
135553509
Test: VtsKernelMemInfoTest
Change-Id: I299d24623c363238e46229f8d09865e3afd6f9c0
Merged-In: I299d24623c363238e46229f8d09865e3afd6f9c0
(cherry picked from commit
ad986341a44de776f3b0f1e140eb359754c45284)
android-build-team Robot [Wed, 17 Jul 2019 03:08:04 +0000 (03:08 +0000)]
Snap for
5733681 from
1674790b4cabab6cedc4dfefb9829f96ba8b6d5b to qt-qpr1-release
Change-Id: Ic3fa62ffc38081759f80b3c833c5c7eeb45b54ae
TreeHugger Robot [Tue, 16 Jul 2019 23:04:47 +0000 (23:04 +0000)]
Merge "usbd: Exit in case of charger mode." into qt-r1-dev
TreeHugger Robot [Tue, 16 Jul 2019 20:15:14 +0000 (20:15 +0000)]
Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden" into qt-r1-dev
Badhri Jagan Sridharan [Thu, 20 Jun 2019 18:14:35 +0000 (11:14 -0700)]
usbd: Exit in case of charger mode.
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
android-build-team Robot [Tue, 16 Jul 2019 03:09:45 +0000 (03:09 +0000)]
Snap for
5730547 from
0d9c4080f49e70c4e20f10ef235f29384aff991b to qt-qpr1-release
Change-Id: Ic5d9484bec5122e5bdc13b067e9c7dc8c227bdc0
Daniel Rosenberg [Mon, 15 Jul 2019 20:22:03 +0000 (13:22 -0700)]
Merge "Reland "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev
am:
11bf3545ab
Change-Id: I9c7af0807d12ef60636d407fbba64ec664a7d31a
Daniel Rosenberg [Mon, 15 Jul 2019 19:56:35 +0000 (19:56 +0000)]
Merge "Reland "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev
Mark Salyzyn [Wed, 29 May 2019 15:49:11 +0000 (08:49 -0700)]
fs_mgr: overlay: do not allow sub-mounts to be overridden
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
android-build-team Robot [Sat, 13 Jul 2019 23:03:22 +0000 (23:03 +0000)]
Snap for
5726885 from
e818cccd58f3c550ef92c8e0e9ddffbf8916c336 to qt-qpr1-release
Change-Id: I571deedb1a0159d6a1b9a51c2f28b81bc23fbc7d
Daniel Rosenberg [Fri, 12 Jul 2019 23:43:56 +0000 (23:43 +0000)]
Reland "Revert "rootdir / sdcard : Stop creating /data/media/obb.""
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
Suren Baghdasaryan [Fri, 12 Jul 2019 20:13:17 +0000 (20:13 +0000)]
Merge "lmkd: Prevent non-main threads being registered or killed by lmkd" into qt-r1-dev
Gerry Fan [Fri, 12 Jul 2019 17:24:00 +0000 (10:24 -0700)]
Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev
am:
ff7da227db
Change-Id: I42b5fdcdb6b87afe44353d830f6b1b5c0c645fc0
Gerry Fan [Fri, 12 Jul 2019 17:11:23 +0000 (17:11 +0000)]
Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev
Gerry Fan [Fri, 12 Jul 2019 15:07:59 +0000 (15:07 +0000)]
Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""
This reverts commit
891a0113941136544509886c1638d973a6c9773c.
Reason for revert: Some Test failed, need more investigation
Bug:
136199978
Change-Id: Ibad0dad02a6701447c39ddcc805d44c9e68bdcce
Christopher Ferris [Fri, 12 Jul 2019 15:15:57 +0000 (15:15 +0000)]
Merge changes Ie0e6e716,I8adc169b into qt-r1-dev
* changes:
Fix error printing code.
Cache only a small portion of page map data.
Suren Baghdasaryan [Tue, 2 Jul 2019 22:52:07 +0000 (15:52 -0700)]
lmkd: Prevent non-main threads being registered or killed by lmkd
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>
Hung-ying Tyan [Fri, 12 Jul 2019 09:49:37 +0000 (02:49 -0700)]
Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-dev
am:
346c17bbc9
Change-Id: I501695115c2c84345db0c78e8694fd31686b7ee7
Hung-ying Tyan [Fri, 12 Jul 2019 09:27:01 +0000 (09:27 +0000)]
Merge "Revert "rootdir / sdcard : Stop creating /data/media/obb."" into qt-dev
Gerry Fan [Thu, 11 Jul 2019 20:44:58 +0000 (20:44 +0000)]
Revert "rootdir / sdcard : Stop creating /data/media/obb."
This reverts commit
c6ca823710d49754c3717e9cf3ba11b9c2648825.
Reason for revert: Q-GSI on Pie devices would crash kernel.
Bug:
136199978
Change-Id: I16a2cb81a1f21627db0cb00324679a322ba42fe0
Christopher Ferris [Fri, 28 Jun 2019 18:24:30 +0000 (11:24 -0700)]
Fix error printing code.
Bug:
135694447
Test: Induced error and verified the errors print properly in logcat.
Change-Id: Ie0e6e71671a8a3e26b4632f93bb2af089a20e2e0
Merged-in: Ie0e6e71671a8a3e26b4632f93bb2af089a20e2e0
(cherry picked from commit
d943301990367e81bd8752327f27827c9f2abba1)
Christopher Ferris [Wed, 26 Jun 2019 00:30:56 +0000 (17:30 -0700)]
Cache only a small portion of page map data.
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)
android-build-team Robot [Thu, 11 Jul 2019 03:00:51 +0000 (03:00 +0000)]
Snap for
5719381 from
bb0838b5114419b4f8ecff67c0b6fb728399c7b7 to qt-qpr1-release
Change-Id: I2d8f8e10162f876d23a573d1bf43f871e599224b
Jaegeuk Kim [Mon, 1 Jul 2019 18:34:58 +0000 (11:34 -0700)]
rootdir: init.rc: use gc_urgent_sleep_time for f2fs
This accelerates f2fs GC when IdleMaint.
Bug:
128594671
Bug:
137190790
Change-Id: I1cea7c99ffd5963711c66460f1c8368b43aeaee2
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
android-build-team Robot [Tue, 9 Jul 2019 03:18:57 +0000 (03:18 +0000)]
Snap for
5713042 from
8ba0b82605dc311ef2af59f9116f80212429d965 to qt-qpr1-release
Change-Id: I8f99b217af6785a97974599d56b8ae1f5aeaa07c
Xu YiPing [Tue, 9 Jul 2019 00:12:56 +0000 (17:12 -0700)]
Avoid get same timestamps in log testcase
am:
ac9e2af1b6
Change-Id: I1ec3face1c149dccedc59ef45fad2e7b73987cb7
Xu YiPing [Wed, 19 Jun 2019 08:38:33 +0000 (16:38 +0800)]
Avoid get same timestamps in log testcase
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
android-build-team Robot [Thu, 4 Jul 2019 03:03:33 +0000 (03:03 +0000)]
Snap for
5706813 from
41d77405d6e8bde886fab97e788759e37c30b49e to qt-qpr1-release
Change-Id: I2b2301fedcf0ef0a6ccf6b02c34df0a799481876
Sandeep Patil [Thu, 27 Jun 2019 07:55:34 +0000 (00:55 -0700)]
dmabuf_dump: Change the default view to per-process stats
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>
Sandeep Patil [Thu, 27 Jun 2019 08:21:11 +0000 (01:21 -0700)]
dmabuf_dump: Fix aosp_x86-eng builds
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>
Sandeep Patil [Wed, 26 Jun 2019 03:17:27 +0000 (20:17 -0700)]
dmabuf_dump: Make output more readable and debug friendly
- 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>
android-build-team Robot [Sat, 29 Jun 2019 23:16:56 +0000 (23:16 +0000)]
Snap for
5698755 from
cac9a2b10bf269437490c40a5717fb2fb8cdb08c to qt-qpr1-release
Change-Id: Ibf513d2d4a45f33afa8216a587bff3848c687944
Paul Lawrence [Thu, 27 Jun 2019 23:25:33 +0000 (16:25 -0700)]
Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
am:
be4e6131d8
Change-Id: Ic522f20a8f1998ed63c90e0e2e6d469ef530b5f2
TreeHugger Robot [Thu, 27 Jun 2019 22:36:27 +0000 (22:36 +0000)]
Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
Paul Lawrence [Tue, 25 Jun 2019 21:36:52 +0000 (14:36 -0700)]
Make ext4 userdata checkpoints work with metadata encryption
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
android-build-team Robot [Thu, 27 Jun 2019 03:04:22 +0000 (03:04 +0000)]
Snap for
5691478 from
8e3b94c2e296f1d23b49e1a61d20f3ebf8f417b5 to qt-qpr1-release
Change-Id: I091613807dad197199709273960130fce78ae8fa
Suren Baghdasaryan [Wed, 26 Jun 2019 22:49:23 +0000 (15:49 -0700)]
Fix IsUsable to check for each controller separately
am:
cb06c2b376
Change-Id: Id04ea4a5a208a307a7a2a3a6c801d38232921f36
Suren Baghdasaryan [Wed, 26 Jun 2019 18:08:50 +0000 (11:08 -0700)]
Fix IsUsable to check for each controller separately
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>
android-build-team Robot [Tue, 25 Jun 2019 12:55:42 +0000 (12:55 +0000)]
Snap for
5686022 from
5dd50fdb9c9386371d3ebafacb04c0270a80d455 to qt-qpr1-release
Change-Id: I3af64a5983084df6a1c4bd3a7088b8bbcf746644
Dan Albert [Mon, 24 Jun 2019 23:30:43 +0000 (16:30 -0700)]
Revert "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor"
am:
ba4684c2b2
Change-Id: Idd32e4c28031b07cda09477b819d4bce0434b4fb
Dan Albert [Mon, 24 Jun 2019 23:30:40 +0000 (16:30 -0700)]
Revert "adb: turn CHECKs into an error + transport restart."
am:
2547f740ea
Change-Id: Ic4ab7cf01bc53ece9f5459e60a7ba602ec086ef0
Dan Albert [Mon, 24 Jun 2019 23:30:35 +0000 (16:30 -0700)]
Revert "Reland "adbd: don't close ep0 until we receive FUNCTIONFS_UNBIND.""
am:
782036b7af
Change-Id: I73978ff63b91e14f79a719d0aec1ee7812749b2d
Dan Albert [Mon, 24 Jun 2019 21:36:01 +0000 (14:36 -0700)]
Revert "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor"
This reverts commit
b2d79c5e48684d3859481bcca0e967fc4021db12.
Bug: http://b/
135753060
Test: treehugger
Change-Id: I2b1b2b7dfb7bab783e4ed40e295329525ceaa0dd
Dan Albert [Mon, 24 Jun 2019 21:35:52 +0000 (14:35 -0700)]
Revert "adb: turn CHECKs into an error + transport restart."
This reverts commit
b41d7ae1a9e5cfd2a7df6d0edee50fdf97c636f0.
Bug: http://b/
135753060
Test: treehugger
Change-Id: Ib7cd7b7eaffa55ec2884a096a1c11739b12af6d1
Dan Albert [Mon, 24 Jun 2019 21:35:35 +0000 (14:35 -0700)]
Revert "Reland "adbd: don't close ep0 until we receive FUNCTIONFS_UNBIND.""
This reverts commit
c33aee8ac1c0958df32dcd2db27ca3d0d1badbd1.
Bug: http://b/
135753060
Test: treehugger
Change-Id: Ic83a44e7c8f860a6c044ca20ec81f365a8a6ba4b
android-build-team Robot [Sat, 22 Jun 2019 23:06:01 +0000 (23:06 +0000)]
Snap for
5681502 from
c745f09b33804242c43f823242f0112645ed3a98 to qt-qpr1-release
Change-Id: I273775fa3eb8585d140cfcbfd517aad621a92d68
Josh Gao [Sat, 22 Jun 2019 02:49:07 +0000 (19:49 -0700)]
Merge changes Ibb3f46b8,I875b87a0,I2d005e17 into qt-dev
am:
64e64eb990
Change-Id: I9541e903885ed2fd5fc1b431f881d4aa33f03411
Josh Gao [Sat, 22 Jun 2019 02:33:06 +0000 (02:33 +0000)]
Merge changes Ibb3f46b8,I875b87a0,I2d005e17 into qt-dev
* 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
David Anderson [Sat, 22 Jun 2019 00:36:16 +0000 (17:36 -0700)]
Merge "fs_mgr: overlay: only use system_<other> if other slot suffix not blank" into qt-dev
am:
e8d1fac1a6
Change-Id: I8d2a6dcca3df75e44a67e8f7e184d52a6558e1a5
David Anderson [Sat, 22 Jun 2019 00:07:56 +0000 (00:07 +0000)]
Merge "fs_mgr: overlay: only use system_<other> if other slot suffix not blank" into qt-dev