system-corennnn

Fork

init: Add support for kernels that don't have finit_module

Some kernels don't have finit_module, which makes booting Android 7.0
impossible if people can't backport it themselves, so set
KERNEL_HAS_FINIT_MODULE := false in BoardConfig.mk file to
allow booting 7.0 even when the kernel doesn't have finit_
module :)

Change-Id: Iec63c1846cdc5e5bb3b61610ea438cf8eff8635b

merge in nyc-mr1-release history after reset to nyc-mr1-dev

Use BOARD_USES_VENDORIMAGE to detect vendor image presence - DO NOT MERGE

When building without vendor/... in the tree, we won't be creating a
vendorimage, so BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE won't be defined. But
we still need to use the vendor image that will be present.

Bug: 31545062
Bug: 30040825
Change-Id: I756adc615aea11da60da4d3a4568caca9fed93ab
(cherry picked from commit 15366542057e7599d8514e9aee602d022c2ea14d)

liblog: add __android_log_close()

Bug: 30963384

(cherry picked from commit df7a4c6bae5f85532d79a93b7d9197a2aab17825)

(cherry picked from commit c12d3d250ceb6a4380d2fcaf7f6d30bdea200dad)

Change-Id: Id4313e99bf86b41c3713e1c2db0242d12aeb8bb7
(cherry picked from commit bd36696a16d3107c9e9503d120d7455dcbfd3fe6)

merge in nyc-dr1-release history after reset to nyc-dr1-dev

Fix adb flakiness on reboot

bug: 31950237

There are two lists of active ADB transports (devices),
and with the emulator, they can go out of sync.

This CL more conservatively checks if there are no
transports in either list before commiting to
register a new transport for the emulator.

Change-Id: Id1201dc59c70825881dad80925c2e5bcc13dbd5e
(cherry picked from commit edaedfd5da41b2f5aa14b4d52742a6d8caa49214)

libsuspend: move to exponential backoff

If for some reason the system can't suspend (usually a driver bug),
libsuspend will currently attempt to retry suspend after 100ms. Because
entering suspend takes a significant amount of CPU time, this can be
extremely expensive and be a major contributor to rapid battery
drain. Move autosuspend to use exponential backoff if the previous
suspend attempt failed.

bug 32092914

Change-Id: I3e9e944f290de5f1853a02e3f61721ba9159df46

merge in nyc-mr1-release history after reset to nyc-mr1-dev

Merge "Traverse /etc/init in a well-defined order" into nyc-mr1-dev

Merge ca7fdffa38cd7c6114e3d82c7f9e1b02433e91e4 on remote branch

Change-Id: Icefcff2ad578b65906706b105603189d1b3ae8cb

Traverse /etc/init in a well-defined order

Bug: 31996208
Test: will need a CTS, not yet done
Change-Id: I5ecc7f0519d42a83065b7b97a31cdb5b33549cda

merge in nyc-mr1-release history after reset to nyc-mr1-dev

Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55 am: 680c3f1dc4 am: f0ce69815f am: 6fb68bb196
am: 2af1a88fcb

Change-Id: I7a5fdc8df2449a332c7696c472e25880bfccc67f

Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55 am: 680c3f1dc4 am: f0ce69815f
am: 6fb68bb196

Change-Id: I02579d25e7117053d6d20781ae75c64fdb76b88d

Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55 am: 680c3f1dc4
am: f0ce69815f

Change-Id: I8e69df083b6d5cd3a7e6bf7113ae836932c2e9f2

Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55
am: 680c3f1dc4

Change-Id: Ibd3e65922bb05b1247018d6dc89d3f79cf0eedd2

Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76
am: 398adf9b55

Change-Id: If29777acccff5966a66e427e5baaeb536e161aaa

Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224
am: 167562aa76

Change-Id: Icb066cdaf63d87324c6eca8b5b45dbc23235aaa2

Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654
am: 8788591224

Change-Id: I2f0ca98c74f23b1125f29b1eaf810143a83754b4

Fix out of bound access in libziparchive am: 1ee4892e66
am: c24dd97654

Change-Id: Ifddcfb7e658156c22539e07915115f4b657925b1

Fix out of bound access in libziparchive
am: 1ee4892e66

Change-Id: I26b48df5a9d39933b90ac063172b4b4ae8428bfd

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 '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)

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

CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1072158 I42e8291da922d117e4397e329304349d9cec8b88 Fix a memory leak in logcat binary
1068729 Ibd6c8b390665189d9850fbe2b762098390ff40a3 init: Don't launch class main in ffbm
1060185 I6115e3357141ed245c63c6eb25fc0fd0a9a7a2bb libutils/Unicode.cpp: Correct length computation and add

Change-Id: Ida275787d80ad1eda85e2bd9f951067b61b32015
CRs-Fixed: 1068729, 1060185, 1072158

Merge "Fix a memory leak in logcat binary"

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