system-core

Fork

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Revert "Set correct permission for pppd"

It causes mtpd can't run pppd.

This reverts commit 3ee3ce44411ace96f3bc9450318834a25a5869fb.

Reported-By: Xuefer H <xuefer@gmail.com>

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Merge remote-tracking branch 'LineageOS/cm-13.0' into cm-13.0-x86

init sysclktz: fix clock without local hack

Change-Id: I96ce84a20c0ed3159acf7e141fa2e79f6860abf9
Signed-off-by: Xuefer <xuefer@gmail.com>

Android 6.0.1 release 79
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAli9mHkACgkQ6K0/gZqxDnjJzwCfdLnOgzlCeqTikEsRCvcfNP1G
XiQAnj3Ke5sG1GzRQ2mecIqAt8EYTxcA
=KoHF
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r79' into marshmallow-x86

Android 6.0.1 release 79

debuggerd: Rebrand tombstone header to LineageOS

Change-Id: Idd08c2eb7e395b464b1510742bf52833f465db08
(cherry picked from commit 4a427dfce617e1c3cc8b85b7196be24b495d9f4e)

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

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

Android 6.0.1 release 74
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlgczu4ACgkQ6K0/gZqxDnitCgCePSzI1XB1U5uYTh/Zi64YsrlT
N+8An0LYcv78UQ/41XTrnjQDUrHXtObc
=d0tS
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r74' into marshmallow-x86

Android 6.0.1 release 74

Fix out of bound access in libziparchive

The boundary check of an invalid EOCD record may succeed due to the
overflow of uint32_t. Fix the check.

Test: Open the crash.apk and libziparchive reports the offset error as expected.

CYNGNOS-3312
Bug: 31251826
Change-Id: I1d8092a19b73886a671bc9d291cfc27d65e3d236
(cherry picked from commit ae8180c06dee228cd1378c56afa6020ae98d8a24)
(cherry picked from commit 1ee4892e66ba314131b7ecf17e98bb1762c4b84c)
(cherry picked from commit 7f246f7fdd2f003c6f3701f599052a2040af6bfb)

init: Fix possible open file pointer

In error case the file is not closed properly.
Add close() before return

Change-Id: Ie1755987859a576045c786105404957d94f0b39d

Android 6.0.1 release 74
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlgczu4ACgkQ6K0/gZqxDnitCgCePSzI1XB1U5uYTh/Zi64YsrlT
N+8An0LYcv78UQ/41XTrnjQDUrHXtObc
=d0tS
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r74' into HEAD

CYNGNOS-3303

Android 6.0.1 release 74

Change-Id: I2dade45f30d4ca2fa8c6efa5c7242de1a02f5c15

Fix out of bound access in libziparchive

The boundary check of an invalid EOCD record may succeed due to the
overflow of uint32_t. Fix the check.

Test: Open the crash.apk and libziparchive reports the offset error as expected.

Bug: 31251826
Change-Id: I1d8092a19b73886a671bc9d291cfc27d65e3d236
(cherry picked from commit ae8180c06dee228cd1378c56afa6020ae98d8a24)
(cherry picked from commit 1ee4892e66ba314131b7ecf17e98bb1762c4b84c)

Android 6.0.1 Release 72 (M4B30X)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlfz3TMACgkQ6K0/gZqxDng2xgCfdFNGZhNxV1w3z+TmFz4gdYnK
8voAoIcFxy07C8wCnjAXC2pWKBlXuEuL
=7iGy
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r72' into HEAD

Android 6.0.1 Release 72 (M4B30X)

# gpg: Signature made Tue 04 Oct 2016 09:47:47 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Conflicts:
init/devices.cpp
init/init.cpp

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.

liblog: add __android_log_close()

Bug: 30963384

(cherry picked from commit df7a4c6bae5f85532d79a93b7d9197a2aab17825)

Change-Id: Ide70df3c04e29301649a1ca234b1b0af687bcbfb
(cherry picked from commit b1b5d507cba4b37221016d308dbf9fdd39019108)

liblog: add __android_log_close()

Bug: 30963384

(cherry picked from commit df7a4c6bae5f85532d79a93b7d9197a2aab17825)

Change-Id: I2255486e84dd55af0f4e7fbbfb616c2deb1765d0
(cherry picked from commit 2d149691552676968b7de337f543463b920578b0)

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

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.

fastboot: Add Alcatel's USB vendor id

Change-Id: Ic4f127c8dcd5db0c039491128862b791197f5c84

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

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

Conflicts:
adb/sockets.cpp

init: revert using fsck -a for boot time optimisation

This is causing the data partition to get dirty / damaged very regularly
and make the data partition to be mounted ro.

This is a combination of 2 commits:

Revert "init: Allow devices to opt-out of fsck'ing on power off"

This reverts commit 516d6913dc5acd695581b3999fab0b5192353022.

Revert "Use fsck.f2fs -a instead of -f for faster boot"

This reverts commit 784c22c8388e50db243ac4ca3871747cd3eefadc.

Conflicts:
init/builtins.cpp

Android 6.0.1 release 66
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlfO7mkACgkQ6K0/gZqxDniqrQCdFR+6OEohyLsDnMK3AuXJaQA+
rtQAniY0clzoDQSIpoOItDPjsmyGKvBN
=ocxE
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r66' into HEAD

Android 6.0.1 release 66

Change-Id: I5ccc6e68283e30b8d0419eb7512c7183e58ec5ed

Android 6.0.1 release 66
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlfO7mkACgkQ6K0/gZqxDniqrQCdFR+6OEohyLsDnMK3AuXJaQA+
rtQAniY0clzoDQSIpoOItDPjsmyGKvBN
=ocxE
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r66' into marshmallow-x86

Android 6.0.1 release 66

Revert "adb: sockets: fix race condition between input_thread and fdevent callback"

This reverts commit 3e872c4ce7d83fee2673694644559f6fa9bdcbe0.

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

libutils: fix deadlock in elapsedRealtimeNano

If n > 2 threads all lock the mutex awaiting the clock method to
be set, the 1st thread will first set the method and unlock. The
2nd thread will then take the mutex, but never unlock because the
clock_method has already been updated by the 1st thread. This causes
a deadlock for threads 3-n.

Solution is to ensure the calling thread always unlocks the mutex if
it has previously locked it.

Log:

"main" prio=5 tid=1 Native
| group="main" sCount=1 dsCount=0 obj=0x733313b0 self=0xb4cf6500
| sysTid=12786 nice=0 cgrp=default sched=0/0 handle=0xb6f86b44
| state=S schedstat=( 41990410 32985836 80 ) utm=3 stm=1 core=2 HZ=100
| stack=0xbe5fb000-0xbe5fd000 stackSize=8MB
| held mutexes=
native: #00 pc 00017638 /system/lib/libc.so (syscall+28)
native: #01 pc 0003ffa5 /system/lib/libc.so (_ZL33__pthread_mutex_lock_with_timeoutP24pthread_mutex_internal_tPK8timespeci+504)
native: #02 pc 000400a9 /system/lib/libc.so (pthread_mutex_lock+26)
native: #03 pc 0000fa01 /system/lib/libutils.so (_ZN7android19elapsedRealtimeNanoEv+16)
native: #04 pc 0000fb1f /system/lib/libutils.so (_ZN7android15elapsedRealtimeEv+2)
native: #05 pc 00214d1d /data/dalvik-cache/arm/system@framework@boot.oat (Java_android_os_SystemClock_elapsedRealtime__+72)

"Thread-6372" prio=5 tid=9 Native
| group="main" sCount=1 dsCount=0 obj=0x32c05120 self=0xacb58100
| sysTid=12829 nice=10 cgrp=bg_non_interactive sched=0/0 handle=0xb38c3930
| state=S schedstat=( 869427 8219115 17 ) utm=0 stm=0 core=2 HZ=100
| stack=0xb37c1000-0xb37c3000 stackSize=1038KB
| held mutexes=
native: #00 pc 00017638 /system/lib/libc.so (syscall+28)
native: #01 pc 0003ffa5 /system/lib/libc.so (_ZL33__pthread_mutex_lock_with_timeoutP24pthread_mutex_internal_tPK8timespeci+504)
native: #02 pc 000400a9 /system/lib/libc.so (pthread_mutex_lock+26)
native: #03 pc 0000fa01 /system/lib/libutils.so (_ZN7android19elapsedRealtimeNanoEv+16)
native: #04 pc 0000fb1f /system/lib/libutils.so (_ZN7android15elapsedRealtimeEv+2)
native: #05 pc 00214d1d /data/dalvik-cache/arm/system@framework@boot.oat (Java_android_os_SystemClock_elapsedRealtime__+72)

HAM-1470
Change-Id: I41874d2b0ea034a35a74da030398231089c15cde