system-core

Fork

Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86

Conflicts:
init/devices.cpp
init/init.cpp
init/ueventd.cpp
libcutils/fs_config.c
libdiskconfig/Android.mk
libpixelflinger/tests/codegen/Android.mk

Android 7.0.0 Release 7 (NRD91D)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlfzAG8ACgkQ6K0/gZqxDng8xQCaAwexjDuFLi6YhT94sgeZ5g6O
5toAnicUb+QAqe05XwcVcGL+Xyp/RH1J
=i4Py
-----END PGP SIGNATURE-----

Merge tag 'android-7.0.0_r7' into nougat-x86

Android 7.0.0 Release 7 (NRD91D)

ueventd: defer modules loading if explicitly listed

The patch extends the syntax of /etc/modules.blacklist.
The modules marked as deferred in this file will be loaded
after all other modules are loaded at coldboot stage.

Add color mode enums

The android_color_mode_t defines the color modes supported
by a display. A display can support multiple different
color modes.

sRGB mode and AdobeRGB are deliberately placed at 7 and 8
so that they match mode ID's used on prior devices.

bug: http://b/27926012
Change-Id: I9ab41b56ec0b495c02539665da5be158ffddf843

Android 7.0.0 Release 14 (NBD90Z)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlfz9GMACgkQ6K0/gZqxDnhurACfUljM7O81T0IHpZ2ZajbmnBdZ
VEAAnju8PhF3rjY42+c/WQhSzOtWqBqn
=bcHy
-----END PGP SIGNATURE-----

Merge tag 'android-7.0.0_r14' of https://android.googlesource.com/platform/system/core into cm-14.0

Android 7.0.0 Release 14 (NBD90Z)

Merge branch 'android-framework.lnx.2.0.r5-rel' of git://codeaurora.org/platform/system/core into cm-14.0

Use __ with attribute __noreturn__ to avoid colliding with noreturn.

Change-Id: I5a73ec69b580b2e70b2c68177078fa56b8353c19

libcutils: Fix thread ID on macOS

macOS 10.12 / Xcode 8 actively prohibit the syscall(2)
usage.

Change-Id: I91ff16600a76e97d0b9b5db7e8905b969fb3482f

libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8

Inconsistent behaviour between utf16_to_utf8 and utf16_to_utf8_length
is causing a heap overflow.

Correcting the length computation and adding bound checks to the
conversion functions.

Test: ran libutils_tests
Bug: 29250543
Change-Id: I6115e3357141ed245c63c6eb25fc0fd0a9a7a2bb
(cherry picked from commit c4966a363e46d2e1074d1a365e232af0dcedd6a1)

init: set default value of ro.hardware to the target name

People usually forget to set the value of androidboot.hardware to
the target name in kernel cmdline which results in boot failure.

The change tries to reduce such an error in the future. The target
name is hardcoded to the image. This eliminates the necessity of
androidboot.hardware.

Merge acd1876a1e313632d7554585c314552c2d809848 on remote branch

Change-Id: Icef2578a2698ed93075ef5da2966ab4428980277

init: Fire a trigger when a class is started/stopped

* This allows us to react to these events without messing
with the master config.

Change-Id: Ifc72efc7b4cc0718838c711395f5fdc3b043827a

init: Don't crash the system due to an invalid mkdir argument

Prior to this change, if someone write

mkdir /data/log/sar_cap system system

in one of their init.rc files, this causes init to get a exception
which causes init to exit with no error message to allow you to track
this down which then causes your kernel to panic.

Let's make this a little more user friendly by simply reporting
an error instead of silently crashing the whole damn system.

Change-Id: I2f8c50391e78a9992d33754cf1f1e34e9fcee047

Promotion of android-framework.lnx.2.0-00009.

CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1059099 I4dfe1ea30e2c211d2389321bd66e3684dd757591 debuggerd: verify that traced threads belong to the righ
1065271 I7878b89a32f0950aa43d3157943982d403632502 init: Add support for slow devices
1064124 I842ce6f62a85b19a79bef4c082e132d1c9649485 init: Fix for handling -p argument in the write command
1050321 I43d0eb850cfff24bbd61b0b1e0f43f591b71e3fe init : start time_daemon when trigger_restart_min_framew

Change-Id: I176768c33df59eb04f34b01cad67fffa0169bdc0
CRs-Fixed: 1059099, 1050321, 1065271, 1064124

Merge "init: Add support for slow devices"

Merge "init: Fix for handling -p argument in the write command"

sdcard: add FUSE_STACKED_IO

Some kernel use FUSE_STACKED_IO
instead of FUSE_SHORTCIRCUIT

Change-Id: I6da68acba9d3a86f896743d161d63b2acc3ab571

Android 7.0.0 release 6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlfR97wACgkQ6K0/gZqxDnjm/gCfZVeR7VwctPJlEjpL4ah1JI6y
eE8An36xaq8JPFZ/2Is+QC2oycX9KGnH
=b1nQ
-----END PGP SIGNATURE-----

Merge tag 'android-7.0.0_r6' of https://android.googlesource.com/platform/system/core into cm-14.0

Android 7.0.0 release 6

Change-Id: I55b17b97794f226b3876a7a46a233a33c09f7256

Merge "init : start time_daemon when trigger_restart_min_framework"

init: Add support for slow devices

Increase the colboot done timeout and keep retrying to locate
the console device on slow targets.

Change-Id: I7878b89a32f0950aa43d3157943982d403632502

Merge e6784dcee14eaa54bafb49a6e495b670827076b8 on remote branch

Change-Id: I2c8baf7092fc4c9d8667ed9d5d61e94fb3716e16

adb: Add wait-for-online command

* Add the pseudo-state "online" which means either "device" or
"recovery". This is used by our tooling.

Change-Id: I92034c477d28f847e24ec72bbb87b252fba875e1

utils: Threads: Handle empty thread names

* Fixes camera for Samsung Exynos devices:

08-30 18:07:03.585 2729 2729 I ExynosCameraFrameFactory: INFO(startThread[1608]):pipeId=0
08-30 18:07:03.585 2729 2729 F libutils.threads: thread name not provided to Thread::run
08-30 18:07:03.586 2729 2729 F libc : Fatal signal 6 (SIGABRT), code -6 in tid 2729 (cameraserver)
08-30 18:07:03.587 2548 2548 W : debuggerd: handling request: pid=2729 uid=1047 gid=1005 tid=2729
08-30 18:07:03.656 6489 6489 F DEBUG : *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
08-30 18:07:03.656 6489 6489 F DEBUG : Build fingerprint: 'samsung/aosp_gts210ltexx/gts210ltexx:7.0/NYC/chris08292135:userdebug/test-keys'
08-30 18:07:03.656 6489 6489 F DEBUG : Revision: '0'
08-30 18:07:03.657 6489 6489 F DEBUG : ABI: 'arm'
08-30 18:07:03.657 6489 6489 F DEBUG : pid: 2729, tid: 2729, name: cameraserver >>> /system/bin/cameraserver <<<
08-30 18:07:03.658 6489 6489 F DEBUG : signal 6 (SIGABRT), code -6 (SI_TKILL), fault addr --------
08-30 18:07:03.673 6489 6489 F DEBUG : Abort message: 'thread name not provided to Thread::run'
08-30 18:07:03.673 6489 6489 F DEBUG : r0 00000000 r1 00000aa9 r2 00000006 r3 00000008
08-30 18:07:03.674 6489 6489 F DEBUG : r4 b5a2c58c r5 00000006 r6 b5a2c534 r7 0000010c
08-30 18:07:03.674 6489 6489 F DEBUG : r8 b28b5380 r9 00000000 sl 00000000 fp b2a92800
08-30 18:07:03.674 6489 6489 F DEBUG : ip 00000016 sp be90b350 lr b4f7e537 pc b4f80d94 cpsr 200f0010
08-30 18:07:03.694 6489 6489 F DEBUG :
08-30 18:07:03.694 6489 6489 F DEBUG : backtrace:
08-30 18:07:03.694 6489 6489 F DEBUG : #00 pc 00049d94 /system/lib/libc.so (tgkill+12)
08-30 18:07:03.694 6489 6489 F DEBUG : #01 pc 00047533 /system/lib/libc.so (pthread_kill+34)
08-30 18:07:03.694 6489 6489 F DEBUG : #02 pc 0001d885 /system/lib/libc.so (raise+10)
08-30 18:07:03.694 6489 6489 F DEBUG : #03 pc 000193d1 /system/lib/libc.so (__libc_android_abort+34)
08-30 18:07:03.694 6489 6489 F DEBUG : #04 pc 00017014 /system/lib/libc.so (abort+4)
08-30 18:07:03.695 6489 6489 F DEBUG : #05 pc 0000bfd5 /system/lib/libcutils.so (__android_log_assert+112)
08-30 18:07:03.695 6489 6489 F DEBUG : #06 pc 0000e265 /system/lib/libutils.so (_ZN7android6Thread3runEPKcij+212)
08-30 18:07:03.695 6489 6489 F DEBUG : #07 pc 00045903 /system/lib/libexynoscamera.so (_ZN7android16ExynosCameraPipe11startThreadEv+74)
08-30 18:07:03.695 6489 6489 F DEBUG : #08 pc 0007b1c3 /system/lib/libexynoscamera.so (_ZN7android24ExynosCameraFrameFactory11startThreadEj+70)
08-30 18:07:03.695 6489 6489 F DEBUG : #09 pc 0007bcef /system/lib/libexynoscamera.so (_ZN7android24ExynosCameraFrameFactory19startInitialThreadsEv+70)
08-30 18:07:03.695 6489 6489 F DEBUG : #10 pc 0006231d /system/lib/libexynoscamera.so (_ZN7android12ExynosCamera22m_startPreviewInternalEv+1140)
08-30 18:07:03.695 6489 6489 F DEBUG : #11 pc 0006b897 /system/lib/libexynoscamera.so (_ZN7android12ExynosCamera12startPreviewEv+1666)
08-30 18:07:03.695 6489 6489 F DEBUG : #12 pc 000037b1 /system/lib/hw/camera.universal5433.so
08-30 18:07:03.695 6489 6489 F DEBUG : #13 pc 0006094f /system/lib/libcameraservice.so (_ZN7android12CameraClient16startPreviewModeEv+102)
08-30 18:07:03.695 6489 6489 F DEBUG : #14 pc 00060825 /system/lib/libcameraservice.so (_ZN7android12CameraClient15startCameraModeENS0_11camera_modeE+68)
08-30 18:07:03.695 6489 6489 F DEBUG : #15 pc 000282f9 /system/lib/libcamera_client.so (_ZN7android8hardware8BnCamera10onTransactEjRKNS_6ParcelEPS2_j+724)
08-30 18:07:03.695 6489 6489 F DEBUG : #16 pc 000359b3 /system/lib/libbinder.so (_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j+70)
08-30 18:07:03.695 6489 6489 F DEBUG : #17 pc 0003d159 /system/lib/libbinder.so (_ZN7android14IPCThreadState14executeCommandEi+684)
08-30 18:07:03.695 6489 6489 F DEBUG : #18 pc 0003cdb7 /system/lib/libbinder.so (_ZN7android14IPCThreadState20getAndExecuteCommandEv+114)
08-30 18:07:03.695 6489 6489 F DEBUG : #19 pc 0003d2bb /system/lib/libbinder.so (_ZN7android14IPCThreadState14joinThreadPoolEb+46)
08-30 18:07:03.695 6489 6489 F DEBUG : #20 pc 00000b4d /system/bin/cameraserver
08-30 18:07:03.696 6489 6489 F DEBUG : #21 pc 00016c2d /system/lib/libc.so (__libc_init+48)
08-30 18:07:03.696 6489 6489 F DEBUG : #22 pc 00000a18 /system/bin/cameraserver

Change-Id: Ib6234260a5fc5798eea580e0ac594313650de933

rootdir: writepid to the correct schedTune cgroup mount point

Seems like AOSP missed these out when switching the schedTune
cgroup mount point from /sys/fs/cgroup/stune/ to /dev/stune/.

Reference commit:
11cde567a8fd6fd37cd462e24dd97d0f57bb12a4 Mount schedTune cgroup as /dev/stune

Change-Id: Ie8b1e7f95af6aef82a914199a48e491a00f210b6

cutils: iosched_policy: Access BFQIO cgroup in /dev/bfqio

AOSP doesn't mount cgroups in /sys/fs/cgroup, but in /dev/.
Follow what AOSP does.

Change-Id: I40d2241e3e5c41612d3a54d22981d3250f8b1ed6

ueventd: Fix bootdevice by-name/by-num link creation

Create bootdevice by-name/by-num links only if the block
device is the bootdevice. This fixes the issue of
bootdevice path being created incorrectly if the first
reported device with by-name/by-num is not the bootdevice.

It also fixes devices in which the bootdevice property
doesn't exist, or the symlink is created by a later step in
the init sequence (such as init.rc itself)

Change-Id: Ifb68080e3149917f9ee88a4a421007f29e8d83d2

fastboot: format f2fs partition instead of just erase

When doing fastboot -w on Darwin for f2fs partitions,
it only erase it without format it due to a flag not set in Android.mk

Change-Id: I642672467d68c75915900bb88c9aa86571140e03

unpackbootimg: stash EFIDroid changes

Source: https://github.com/efidroid/build/commits/5a8c5e9fe25cb4e0e182f55c1dc96d49a95b341c/tools/unpackbootimg

commit c0bb55fdf63c6ba5b8f4b30303ab624e5cd1eab0
Author: M1cha <sigmaepsilon92@gmail.com>
Date: Fri Aug 26 11:12:28 2016 +0200

unpackbootimg: extract appended fdt too

commit 39fa4df2e200501400a7f80097543c684c91ad8b
Author: M1cha <sigmaepsilon92@gmail.com>
Date: Sun Aug 28 20:49:00 2016 +0200

tools: unpackbootimg: don't write os_version and os_patch_level if they are 0

commit 4bf90a6ecc2530c3eb6d97d90a595655f5c8189f
Author: M1cha <sigmaepsilon92@gmail.com>
Date: Sun Sep 4 10:54:43 2016 +0200

tools: unpackbootimg: create output directory if it doesn't exist

commit 863757ec8f008f189aeb188a6fb8bf8718c040e6
Author: M1cha <sigmaepsilon92@gmail.com>
Date: Sun Sep 4 10:57:02 2016 +0200

tools: unpackbootimg: don't try to split zImage if it's too small

commit 21c7d91fce55bf6ec242ad81768f679a461166cf
Author: M1cha <sigmaepsilon92@gmail.com>
Date: Sun Sep 4 10:57:29 2016 +0200

tools: unpackbootimg: fix base and offset calculations

commit 5a8c5e9fe25cb4e0e182f55c1dc96d49a95b341c
Author: M1cha <sigmaepsilon92@gmail.com>
Date: Sun Sep 4 11:09:47 2016 +0200

tools: unpackbootimg: improve base calculation by substracting 0x8000

Change-Id: I62f4f92c5caaed06cd3858900135231f91f6bc79

debuggerd: verify that traced threads belong to the right process.

Fix two races in debuggerd's PTRACE_ATTACH logic:
1. The target thread in a crash dump request could exit between the
/proc/<pid>/task/<tid> check and the PTRACE_ATTACH.
2. Sibling threads could exit between listing /proc/<pid>/task and the
PTRACE_ATTACH.

Bug: http://b/29555636
Change-Id: I4dfe1ea30e2c211d2389321bd66e3684dd757591
(cherry picked from commit d7603583f90c2bc6074a4ee2886bd28082d7c65b)

init: Fix for handling -p argument in the write command

We now correctly process the -p argument even if it is not the last
argument passed in to the function. The earlier iteration used to
incorrectly skip over it under some cases.

Change-Id: I842ce6f62a85b19a79bef4c082e132d1c9649485