Commit graph

32047 commits

Author SHA1 Message Date
Bowgo Tsai
08d996678c Merge "fs_mgr: adding fs_mgr_get_slot_suffix() public API" am: b26f48f135 am: 4c96971cee
am: e203dbb2f6

Change-Id: Icca6f2dac8c9bef0d3b1d0d2202371f3e101be19
2017-04-13 13:56:54 +00:00
Bowgo Tsai
e203dbb2f6 Merge "fs_mgr: adding fs_mgr_get_slot_suffix() public API" am: b26f48f135
am: 4c96971cee

Change-Id: Icad63b84bb6de85b1a73db84a784ad8b5bdb0f38
2017-04-13 13:50:49 +00:00
Bowgo Tsai
4c96971cee Merge "fs_mgr: adding fs_mgr_get_slot_suffix() public API"
am: b26f48f135

Change-Id: I201aa8370395eca0ce63c6912df977019c2c2f3b
2017-04-13 13:42:49 +00:00
Treehugger Robot
b26f48f135 Merge "fs_mgr: adding fs_mgr_get_slot_suffix() public API" 2017-04-13 13:26:42 +00:00
Bowgo Tsai
87d0836cda fs_mgr: adding fs_mgr_get_slot_suffix() public API
The function returns "_a" or "_b" based on two possible values in
kernel cmdline:

  - androidboot.slot = a or b OR
  - androidboot.slot_suffix = _a or _b

Bug: 33254008
Bug: 36533366
Test: boot sailfish
Change-Id: Ia0a524e4145ebf61af5821f42ecad212c95ed748
2017-04-13 18:28:48 +08:00
Hidehiko Abe
035224e3c5 Merge "Force set timezone to UTC in logd." am: 0de940c26d am: 5cadd1399b
am: 8becca0b44

Change-Id: Ib06e78dedd61899a65181bb00e4fd20c0c69f555
2017-04-13 07:33:28 +00:00
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
246704f902 Merge "libutils: mark as vendor_available" into oc-dev
am: bed3cbd8ac

Change-Id: Ia9537e563c9ad050fe2f6629a7705e081fe864c1
2017-04-13 05:06:35 +00:00
TreeHugger Robot
bed3cbd8ac Merge "libutils: mark as vendor_available" into oc-dev 2017-04-13 04:55:20 +00:00
Martijn Coenen
30ec708335 Merge "restorecon hwservice_contexts." into oc-dev
am: f8952a196c

Change-Id: If828fe3afd399f15fcc351f39dc0cdc7531ed635
2017-04-13 03:43:51 +00:00
Martijn Coenen
f8952a196c Merge "restorecon hwservice_contexts." into oc-dev 2017-04-13 03:34:48 +00:00
Steven Moreland
5a8c9a1f6e Merge "libutils: mark as vendor_available" am: 86c725a4c2 am: 7c8b168c4e
am: 45d079ac73

Change-Id: If00a7cc3e30d130230375e92452bbc966f425a5c
2017-04-13 02:04:35 +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
Martijn Coenen
6887273a28 restorecon hwservice_contexts.
Test: marlin boots, angler boots
Bug: 34454312
Change-Id: I5da8b0b10a7a4c0e6e0c9aea39004852889e8d97
2017-04-12 18:02:33 -07:00
Dmitri Plotnikov
bcb5e5008c Merge "Passing additional parameter to powerctl" am: e0ab2557d4 am: 0c146e6572
am: cff6544e2e

Change-Id: I6e21babe911996ac0f91e9a61aeb46499c4949c0
2017-04-13 00:52:00 +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
2ea9ec4c83 Merge "Moved include/backtrace to libbacktrace/include" am: 83f50843cb am: 7d9be3527e
am: 0a80ee0357

Change-Id: Ie3e48f845a82ba03108f8ab8b638b4475586ab35
2017-04-13 00:38:22 +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
31a2dd9c70 Merge "disable module loading after BOOT_COMPLETED broadcast" am: 20b7f78204 am: 65c8cb8935
am: f560cc78af  -s ours

Change-Id: I8fcb09242263cd4c068c86ed4e5f80c5ff0b47cb
2017-04-12 23:18:52 +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
00b0b347a0 Merge "disable module loading after BOOT_COMPLETED broadcast" into oc-dev
am: a02b1f5bed

Change-Id: I7c750c9838b22cbcd9acb849c10be47ba7a50feb
2017-04-12 23:09:04 +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
Jaesoo Lee
a02b1f5bed Merge "disable module loading after BOOT_COMPLETED broadcast" into oc-dev 2017-04-12 22:58:18 +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
Vijay Venkatraman
25a6a9f1a5 Merge "Moved all files from include/system to libsystem/include/system" into oc-dev
am: a22648179d  -s ours

Change-Id: I6b17c639ef37eb2d16437be78180cf159b9b892d
2017-04-12 21:34:24 +00: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
TreeHugger Robot
a22648179d Merge "Moved all files from include/system to libsystem/include/system" into oc-dev 2017-04-12 20:56:21 +00:00
Dan Cashman
18ff05146f init: use platform sepolicy version indicated by /vendor.
am: 692c3e4d38

Change-Id: I81874aea3896c1156295616f12c211e9423d5ca7
2017-04-12 20:43:31 +00:00
Elliott Hughes
f9a0c78fe0 Merge "libcutils: fix system-background tasks shown in top command" am: e4e4777fc7 am: 48eaef5804
am: 7c44e1ffd2

Change-Id: I5e257bb30006b4a390eb347082c1fd3a0f2a7b1c
2017-04-12 18:57:46 +00: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
Dan Cashman
692c3e4d38 init: use platform sepolicy version indicated by /vendor.
It's possible, in the event of a platform update, for the platform
SELinux policy to change from the policy on which the vendor SELinux
policy was originally based.  In this case, a different mapping file
to bridge the differences between the new policy and the old needs to
be selected.

Make init choose which mapping policy file to use based on the version
reported in /vendor/etc/selinux/plat_sepolicy_vers.txt.

Bug: 36783775
Test: Force compilation of sepolicy on-device with mapping file changed
to new location and name, using the value reported on /vendor.

Change-Id: I63c883ccb79dd31c92dabe44a55c4ab50a3735e6
2017-04-12 10:45:08 -07:00
Steven Moreland
91527edec8 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
Merged-In: I6c1279a74ef071851401e38bbdd377f13827694c
Change-Id: I6c1279a74ef071851401e38bbdd377f13827694c
2017-04-12 16:00:02 +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
406a75f1fc Merge "Move adb backup/restore helptext to adb shell bu help." am: 4a36cc7cf6 am: 8898a151e6
am: 9f23feae1f

Change-Id: Ic3cd83b0a69d61f399ab45a1ae9cada873a061cc
2017-04-12 09:28:19 +00: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
6289bb1341 Merge "ueventd: remove /dev/log" am: 120add07ab am: 9ae606d659
am: 6c2e8b10fe

Change-Id: Ic257774710a74e72a97f4187e48587150ee3d613
2017-04-12 08:17:29 +00:00