Commit Graph

29667 Commits

Author SHA1 Message Date
Hidehiko Abe 8becca0b44 Merge "Force set timezone to UTC in logd." am: 0de940c26d
am: 5cadd1399b

Change-Id: I3b3f9af4e461fab3cde1dca2d4a7785a5ce84089
2017-04-13 07:26:53 +00:00
Hidehiko Abe 5cadd1399b Merge "Force set timezone to UTC in logd."
am: 0de940c26d

Change-Id: I2c68d784b134461bd82bc1d8fe05f95b1ad98225
2017-04-13 07:21:24 +00:00
Treehugger Robot 0de940c26d Merge "Force set timezone to UTC in logd." 2017-04-13 07:14:02 +00:00
Steven Moreland 45d079ac73 Merge "libutils: mark as vendor_available" am: 86c725a4c2
am: 7c8b168c4e

Change-Id: Ie78167b0b908bf97fa018c03ec1c07d8be6158f6
2017-04-13 01:58:29 +00:00
Steven Moreland 7c8b168c4e Merge "libutils: mark as vendor_available"
am: 86c725a4c2

Change-Id: I8e46dc744dca4d0d3400fe1f8325c43ee3d03677
2017-04-13 01:52:29 +00:00
Treehugger Robot 86c725a4c2 Merge "libutils: mark as vendor_available" 2017-04-13 01:40:56 +00:00
Dmitri Plotnikov cff6544e2e Merge "Passing additional parameter to powerctl" am: e0ab2557d4
am: 0c146e6572

Change-Id: Ifd007a10f0a352cb86b61f22608d382696331544
2017-04-13 00:46:54 +00:00
Dmitri Plotnikov 0c146e6572 Merge "Passing additional parameter to powerctl"
am: e0ab2557d4

Change-Id: I9afd4fe2a0c8c1c9de9da7ca1758f4cba6d38a72
2017-04-13 00:41:53 +00:00
Vijay Venkatraman 0a80ee0357 Merge "Moved include/backtrace to libbacktrace/include" am: 83f50843cb
am: 7d9be3527e

Change-Id: I5dde1c0757d2f259c08d7dbd3c4b91655dca56da
2017-04-13 00:33:25 +00:00
Dmitri Plotnikov e0ab2557d4 Merge "Passing additional parameter to powerctl" 2017-04-13 00:30:24 +00:00
Vijay Venkatraman 7d9be3527e Merge "Moved include/backtrace to libbacktrace/include"
am: 83f50843cb

Change-Id: I60786aa4a55bb410dd458c3bb34844678c1d8f44
2017-04-13 00:28:56 +00:00
Vijay Venkatraman 83f50843cb Merge "Moved include/backtrace to libbacktrace/include" 2017-04-13 00:17:13 +00:00
Jaesoo Lee f560cc78af Merge "disable module loading after BOOT_COMPLETED broadcast" am: 20b7f78204
am: 65c8cb8935

Change-Id: I40a636fba58a0ccaeeeaab3510229dfebf0925a9
2017-04-12 23:13:19 +00:00
Jaesoo Lee 65c8cb8935 Merge "disable module loading after BOOT_COMPLETED broadcast"
am: 20b7f78204

Change-Id: I8dc2233f7a39deee7d557d65d8130248fbb32cf5
2017-04-12 23:07:47 +00:00
Jaesoo Lee 20b7f78204 Merge "disable module loading after BOOT_COMPLETED broadcast" 2017-04-12 22:59:37 +00:00
Dmitri Plotnikov 00e1c4f330 Passing additional parameter to powerctl
Test: adb reboot recovery,foo and verify that the parameter reaches bootloader
Change-Id: I9690cf96cf9730e5324b9f5310c3d0341fe25fe2
2017-04-12 14:38:23 -07:00
Hidehiko Abe 352476e118 Force set timezone to UTC in logd.
(cherry picked from commit c27f12a3d396f113c5ae09d2f2c8ff7de3f8b551)

logd assumes that it is running in UTC time zone.
However, if persist.sys.timezone is set at some point later,
that affects and confuses logd behavior.
To avoid such a case, this CL sets TZ to UTC, which overrides
the property's behavior.

Test: Ran CtsOsTestCases.
Test: gTest liblog-unit-tests, logd-unit-tests and logcat-unit-tests
Bug: 33566779
Change-Id: Ib9edd4cb06f019a33aaf8d77d33bd82fdbbda480
2017-04-12 14:33:17 -07:00
Elliott Hughes 7c44e1ffd2 Merge "libcutils: fix system-background tasks shown in top command" am: e4e4777fc7
am: 48eaef5804

Change-Id: Ica9a0274a89ce110d54a28d4828cd8196c350161
2017-04-12 18:49:28 +00:00
Elliott Hughes 48eaef5804 Merge "libcutils: fix system-background tasks shown in top command"
am: e4e4777fc7

Change-Id: Ic6922c4c2022515f7b668f195055df1401087f46
2017-04-12 18:44:58 +00:00
Elliott Hughes e4e4777fc7 Merge "libcutils: fix system-background tasks shown in top command" 2017-04-12 18:33:43 +00:00
Steven Moreland 48cdaff063 libutils: mark as vendor_available
By setting vendor_available, the following may become true:

* a prebuilt library from this release may be used at runtime by
  in a later releasse (by vendor code compiled against this release).
  so this library shouldn't depend on runtime state that may change
  in the future.
* this library may be loaded twice into a single process (potentially
  an old version and a newer version). The symbols will be isolated
  using linker namespaces, but this may break assumptions about 1
  library in 1 process (your singletons will run twice).

Background:

This means that these modules may be built and installed twice --
once for the system partition and once for the vendor partition. The
system version will build just like today, and will be used by the
framework components on /system. The vendor version will build
against a reduced set of exports and libraries -- similar to, but
separate from, the NDK. This means that all your dependencies must
also mark vendor_available.

At runtime, /system binaries will load libraries from /system/lib*,
while /vendor binaries will load libraries from /vendor/lib*. There
are some exceptions in both directions -- bionic(libc,etc) and liblog
are always loaded from /system. And SP-HALs (OpenGL, etc) may load
/vendor code into /system processes, but the dependencies of those
libraries will load from /vendor until it reaches a library that's
always on /system. In the SP-HAL case, if both framework and vendor
libraries depend on a library of the same name, both versions will be
loaded, but they will be isolated from each other.

It's possible to compile differently -- reducing your source files,
exporting different include directories, etc. For details see:

https://android-review.googlesource.com/368372

None of this is enabled unless the device opts into the system/vendor
split with BOARD_VNDK_VERSION := current.

Bug: 36426473
Bug: 36079834
Test: m -j libutils
Test: attempt to compile with BOARD_VNDK_VERSION := current
Change-Id: I6c1279a74ef071851401e38bbdd377f13827694c
2017-04-12 08:59:41 -07:00
Johan Torås Halseth 9f23feae1f Merge "Move adb backup/restore helptext to adb shell bu help." am: 4a36cc7cf6
am: 8898a151e6

Change-Id: I07bdc73b924280a4960bec4d087fe08286e8f60e
2017-04-12 09:22:22 +00:00
Johan Torås Halseth 8898a151e6 Merge "Move adb backup/restore helptext to adb shell bu help."
am: 4a36cc7cf6

Change-Id: I89f97a7885fad7ed9456b1f2e63013e00a707a08
2017-04-12 09:16:52 +00:00
Johan Torås Halseth 4a36cc7cf6 Merge "Move adb backup/restore helptext to adb shell bu help." 2017-04-12 09:10:29 +00:00
Ganesh Mahendran 6748f24d70 libcutils: fix system-background tasks shown in top command
tasks in system-background cgroup will be shown as below:
 580   580 system   12  -8   1% S 190656K  19408K unk surfaceflinger  /system/bin/surfaceflinger

This patch fix this issue.

Change-Id: Ib39ff892010498548d7fbfb4021df62498acd033
Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
2017-04-12 16:25:25 +08:00
Tom Cherry 6c2e8b10fe Merge "ueventd: remove /dev/log" am: 120add07ab
am: 9ae606d659

Change-Id: Id68761b8aa9b72a4b2d78cbc42f4babfc01663bf
2017-04-12 08:11:32 +00:00
Tom Cherry 9ae606d659 Merge "ueventd: remove /dev/log"
am: 120add07ab

Change-Id: I136158c1f82ade6c6f41b2c02f9b4d6a592fe4c6
2017-04-12 08:06:02 +00:00
Keun-young Park 493c2cd50f Merge "use s_max_mnt_count to detect mke2fs generated partition" am: 2e3abe2d05
am: 1dc9738730

Change-Id: I7e0966f9bbcb1ada7d8b4808d5462a5cee5e9eb4
2017-04-12 08:01:11 +00:00
Treehugger Robot 120add07ab Merge "ueventd: remove /dev/log" 2017-04-12 07:58:33 +00:00
Keun-young Park 1dc9738730 Merge "use s_max_mnt_count to detect mke2fs generated partition"
am: 2e3abe2d05

Change-Id: I239527498a38084c472f1629017c993a1a52f41c
2017-04-12 07:55:43 +00:00
Treehugger Robot 2e3abe2d05 Merge "use s_max_mnt_count to detect mke2fs generated partition" 2017-04-12 07:45:13 +00:00
Tom Cherry ed5f8ca6e9 Merge "ueventd: replace char** links with std::vector<std::string>" am: 162118928e
am: a778c81e11

Change-Id: I9511394bb5edd957ca8c1a930a09c2006c6372ea
2017-04-12 01:10:52 +00:00
Jaesoo Lee dcf4d19dd9 disable module loading after BOOT_COMPLETED broadcast
This CL disables module loading by writing 1 to
/proc/sys/kernel/modules_disabled when the property sys.boot_completed
is set to 1 by ActivityManagerService (at the broadcast of
PHASE_BOOT_COMPLETED).

Bug: 36515654
Test: tested on sailfish and verified that module loading is disabled in
userdebug and enabled in eng mode
Merged-In: Id38d34a6395966ab21e440614337c0cfca791ad0
(cherry picked from commit 6ed19d1675)

Change-Id: I2faa459b450b3a64f854c832c6b91cbf682bbffa
2017-04-12 10:08:26 +09:00
Tom Cherry a778c81e11 Merge "ueventd: replace char** links with std::vector<std::string>"
am: 162118928e

Change-Id: I3d6a16d0da51e3b45cdc607db0d93bc12d0767c3
2017-04-12 01:05:21 +00:00
Treehugger Robot 162118928e Merge "ueventd: replace char** links with std::vector<std::string>" 2017-04-12 00:57:35 +00:00
Keun-young Park 95e233f9ff use s_max_mnt_count to detect mke2fs generated partition
- Old tool will set it to 10 while mke2fs will set it to -1.
- For now, only tag it.
- TODO: possibly add different policy per image tool version.

bug: 32246772
Test: check dmesg after reboot
Change-Id: Ib763f8ba64957412d2b02a9d6e3fc2bfcf55851e
2017-04-11 17:55:14 -07:00
Tom Cherry d4ff8d83d3 ueventd: remove /dev/log
This was marked deprecated in 2014 and removed in 2015, let's remove
the uevent rule now too.

Test: see that logging still works on bullhead
Change-Id: Idaf3f49a1afe7046eba6c976628b9f1c8b3ec094
2017-04-11 21:35:46 +00:00
Tianjie Xu 085efd7931 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours am: c800d82044 am: 497461adc5 am: 02e7225f78 am: 587efe8ee9
am: 745f034705

Change-Id: Id2b7e44f75295eb20a0d55aa8abc7a3c6ce9969e
2017-04-11 20:25:32 +00:00
Tianjie Xu ed22016d12 Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb am: 2d37855038 am: 3c3eed744e am: 5fa554a46a
am: 223de992a4

Change-Id: Id39959956c2ce2f8910d69e31ee5fe9a2638e7b6
2017-04-11 20:20:01 +00:00
Tianjie Xu 745f034705 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours am: c800d82044 am: 497461adc5 am: 02e7225f78
am: 587efe8ee9

Change-Id: Ief97c37295007df0da7ae36efeee8ac541f5e722
2017-04-11 20:20:01 +00:00
Tianjie Xu 223de992a4 Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb am: 2d37855038 am: 3c3eed744e
am: 5fa554a46a

Change-Id: I80db3090f5ab0efd50051a5fec2c61a5e947ab50
2017-04-11 20:15:01 +00:00
Tianjie Xu 587efe8ee9 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours am: c800d82044 am: 497461adc5
am: 02e7225f78

Change-Id: I687fc898264c93bedb34076bfa6d981d5059f381
2017-04-11 20:15:01 +00:00
Tianjie Xu f4bb9db0a8 Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 am: afddaba0cc am: 0b1ad23070 am: d4b4f0a1e1
am: 2aea56db64

Change-Id: Icecc6630e82f43360d55b925a5946ffd0d608f58
2017-04-11 20:11:00 +00:00
Tianjie Xu 02e7225f78 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours am: c800d82044
am: 497461adc5

Change-Id: I0b66858b609852df5a04aed279412fb2d03975a2
2017-04-11 20:11:00 +00:00
Tianjie Xu 5fa554a46a Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb am: 2d37855038
am: 3c3eed744e

Change-Id: I065c6eb98fcd7af9e486a211fb6f8611bcc7a5d3
2017-04-11 20:10:30 +00:00
Adam Lesinski 5382a520e0 Merge "ZipWriter: Keep LFH and CFH in sync" am: a309bc491d
am: 80d8a9350c

Change-Id: Ic6b7335a0af0203368fda3f5fb130716229ec0d8
2017-04-11 20:05:26 +00:00
Tianjie Xu 2aea56db64 Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 am: afddaba0cc am: 0b1ad23070
am: d4b4f0a1e1

Change-Id: Ib8d12d33296b0b5d618f4815e99eddebda342a5a
2017-04-11 20:05:01 +00:00
Tianjie Xu 3c3eed744e Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb
am: 2d37855038

Change-Id: I7cd9d0c60ef387cac0454e2adbe6d437899212a6
2017-04-11 20:05:01 +00:00
Tianjie Xu 497461adc5 Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours
am: c800d82044

Change-Id: I09b7718561380c974ce2977b4390e12f262c11d7
2017-04-11 20:05:01 +00:00
Adam Lesinski 80d8a9350c Merge "ZipWriter: Keep LFH and CFH in sync"
am: a309bc491d

Change-Id: I06f20c0edf1cc60bd39f38d45d512cfbf39bb0a9
2017-04-11 20:00:27 +00:00