ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12820 commits 1 branch 0 tags 217 MiB
Commit graph

12820 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Salyzyn
a76d2bb40b am 05c92d2b: Merge "liblog: Add BM_is_loggable benchmark" 
* commit '05c92d2b4fa7e96f6e64384f197e12916ed1d821':
  liblog: Add BM_is_loggable benchmark
 2015-04-24 21:54:42 +00:00
Mark Salyzyn
05c92d2b4f Merge "liblog: Add BM_is_loggable benchmark" 2015-04-24 21:42:47 +00:00
Elliott Hughes
e6433c1245 am a5669861: Merge "Revert "Revert "Remove now-unusable \'setcon\' command.""" 
* commit 'a5669861c1abd023aa708d21e6f9d7f2c8803903':
  Revert "Revert "Remove now-unusable 'setcon' command.""
 2015-04-24 20:39:14 +00:00
Elliott Hughes
a5669861c1 Merge "Revert "Revert "Remove now-unusable 'setcon' command.""" 2015-04-24 20:31:19 +00:00
Elliott Hughes
ec38990298 am 132440b0: Merge "Revert "Revert "Make init re-exec itself for its SELinux domain transition.""" 
* commit '132440b087d35ebddd021b86bdcb3aa5c8feec80':
  Revert "Revert "Make init re-exec itself for its SELinux domain transition.""
 2015-04-24 19:43:14 +00:00
Elliott Hughes
c7ca9dd6c8 Revert "Revert "Remove now-unusable 'setcon' command."" 
This reverts commit b862bd00a4.

This change was fine but an earlier change it depended on was broken.
That change has been fixed and resubmitted.

Bug: http://b/19702273
Change-Id: I17e565721026e48e2a73526f729f2481d4d6edb5
 2015-04-24 12:41:47 -07:00
Elliott Hughes
132440b087 Merge "Revert "Revert "Make init re-exec itself for its SELinux domain transition.""" 2015-04-24 19:33:21 +00:00
Elliott Hughes
f65730e620 Revert "Revert "Make init re-exec itself for its SELinux domain transition."" 
This reverts commit 4217374611.

It turns out that the kernel passes any unrecognized arguments on to init,
and (at least) N6 and N9 have such arguments. My lazy check of argc was
thus insufficient to recognize what stage of init we were in, so we'd
skip to stage 2 and not set up SELinux. And apparently you can get a
very long way with SELinux off... We'll fix that in a later change.

Bug: 19702273
Change-Id: I43b3fb722fed35dd217cb529cbcac9a29aff4e4b
 2015-04-24 12:26:05 -07:00
Elliott Hughes
48ba758782 am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures." 
* commit '34dd04dbb53bc6dc1ec4f9c6639b10acb7c53c72':
  Improve bad error reporting seen in shamu SELinux boot failures.
 2015-04-24 18:46:59 +00:00
Elliott Hughes
34dd04dbb5 Merge "Improve bad error reporting seen in shamu SELinux boot failures." 2015-04-24 18:36:55 +00:00
Elliott Hughes
5e7dd4454f Improve bad error reporting seen in shamu SELinux boot failures. 
Explain why mount failed, and explicitly say that the umount fixed it.

Change-Id: I13b0927a36517f2fc9f9580945ba6ebefc4882df
 2015-04-24 11:05:48 -07:00
Tom Cherry
92b8263576 am 10936d1f: Merge "init: consider all platform devices for find_platform_device" 
* commit '10936d1fdb639c91ed9062b92909d9928e6b69ea':
  init: consider all platform devices for find_platform_device
 2015-04-24 17:42:07 +00:00
Tom Cherry
10936d1fdb Merge "init: consider all platform devices for find_platform_device" 2015-04-24 17:34:32 +00:00
Nick Kralevich
2db3cd3e5e am 46fee19c: Merge "Revert "Make init re-exec itself for its SELinux domain transition."" 
* commit '46fee19cb27dd24a58bbcad608058f25ca7b3e52':
  Revert "Make init re-exec itself for its SELinux domain transition."
 2015-04-24 17:05:47 +00:00
Nick Kralevich
ac6995690a am f0b47920: Merge "Revert "Remove now-unusable \'setcon\' command."" 
* commit 'f0b4792017b338ac6397e9809f3629c33ef94c2d':
  Revert "Remove now-unusable 'setcon' command."
 2015-04-24 17:05:46 +00:00
Nick Kralevich
46fee19cb2 Merge "Revert "Make init re-exec itself for its SELinux domain transition."" 2015-04-24 16:58:01 +00:00
Nick Kralevich
4217374611 Revert "Make init re-exec itself for its SELinux domain transition." 
shamu isn't booting.

This reverts commit adf0d1bbfa.

Change-Id: I89d568838cebbe14cc4a8ae3843f0f1ac54987af
 2015-04-24 16:57:21 +00:00
Nick Kralevich
f0b4792017 Merge "Revert "Remove now-unusable 'setcon' command."" 2015-04-24 16:56:44 +00:00
Nick Kralevich
b862bd00a4 Revert "Remove now-unusable 'setcon' command." 
Temporarily revert because device isn't booting.

This reverts commit 7b15ac99f3.

Change-Id: Ice986bac62e20c70f7bedf1744a617b97392ae8c
 2015-04-24 16:55:16 +00:00
Mark Salyzyn
1ac79cbd89 liblog: Add BM_is_loggable benchmark 
- On a N9 64-bit benchmark, the __android_log_is_loggable overhead
  is roughly 500ns (1/2 of a syscall?)

Bug: 19544788
Bug: 17760225
Bug: 20416721
Change-Id: Ib9e4d06d96e1b19ca5d459e569ead451ef47a9c0
 2015-04-24 07:59:44 -07:00
Elliott Hughes
301691c258 am 659b7d63: Merge "Remove now-unusable \'setcon\' command." 
* commit '659b7d633a03a03674f82f02f567ac5ff18fba41':
  Remove now-unusable 'setcon' command.
 2015-04-24 04:07:24 +00:00
Elliott Hughes
20dfbb0fd1 am fa66b4e1: Merge "Remove long-obsolete file." 
* commit 'fa66b4e136e0baeb41311405635d5852048e6ce7':
  Remove long-obsolete file.
 2015-04-24 04:07:23 +00:00
Elliott Hughes
659b7d633a Merge "Remove now-unusable 'setcon' command." 2015-04-24 04:01:59 +00:00
Elliott Hughes
fa66b4e136 Merge "Remove long-obsolete file." 2015-04-24 03:59:05 +00:00
Elliott Hughes
2a87d2b155 Remove long-obsolete file. 
Change-Id: I728cc13b4a7ac93f9c923d2fc9bda2bb65ffe99d
 2015-04-23 20:57:12 -07:00
Elliott Hughes
7b15ac99f3 Remove now-unusable 'setcon' command. 
Bug: http://b/19702273
Change-Id: Icd340c80ba074476dcc63f1c1dd5c61a5c768893
 2015-04-23 20:54:46 -07:00
Elliott Hughes
2869398351 am 1a39a994: Merge "Correct magic number on umount2" 
* commit '1a39a994d9c1d407fec17e0b9a00383d50c48085':
  Correct magic number on umount2
 2015-04-24 03:28:43 +00:00
Elliott Hughes
1a39a994d9 Merge "Correct magic number on umount2" 2015-04-24 03:21:43 +00:00
Elliott Hughes
ef68fd3f80 am d4656784: Merge "Make init re-exec itself for its SELinux domain transition." 
* commit 'd46567848bfcdc8f2cbc3faeef487cf5c770b43a':
  Make init re-exec itself for its SELinux domain transition.
 2015-04-24 03:18:39 +00:00
Elliott Hughes
d46567848b Merge "Make init re-exec itself for its SELinux domain transition." 2015-04-24 03:10:16 +00:00
William Roberts
4555b69f26 Correct magic number on umount2 
The umount2 call was using the magic constant 2 which is
has a defined and proper macro in mount.h as MNT_DETATCH.

Change-Id: I4ca4a6d31cbf5495c545088e3d90a8894a9f912f
 2015-04-24 01:13:35 +00:00
Mark Salyzyn
85a9566f7c am 76520752: Merge "rootfs: init.rc start logd parse error" 
* commit '765207524fcbe261686c5d96bc42ea3dcc124f0a':
  rootfs: init.rc start logd parse error
 2015-04-23 22:34:48 +00:00
Mark Salyzyn
765207524f Merge "rootfs: init.rc start logd parse error" 2015-04-23 22:25:30 +00:00
Elliott Hughes
adf0d1bbfa Make init re-exec itself for its SELinux domain transition. 
Change-Id: I38adabe5789d671e3f7d21936071a758ec8cea8a
 2015-04-23 15:20:51 -07:00
Tom Cherry
1225a61f0a init: consider all platform devices for find_platform_device 
Certain platforms list their platform devices with a path other than
the current /devices or /devices/platform.  Additionally, sometimes
these paths are a platform device themselves.  An example are devices
with a path /devices/soc.0/... where /devices/soc.0 is also a platform
devices.

Instead of continuing to special case these path prefixes, we can
consider the entire path, given that no mmc or usb devices create
platform devices as subdevices, which they should not by their very
nature.

This keeps the symlinks for block devices named identically for
current platform devices and places them in /dev/block/<full path to
device> for devices in locations other than /devices or
/devices/platform, eg /dev/block/platform/soc.0/7824900.sdhci

This keeps the symlinks for character deviced named identically for
all cases.

Change-Id: Ifc8eedf1086db1826dbc8f7e96cdfcfa5da876b3
 2015-04-23 15:04:06 -07:00
Mark Salyzyn
9d4b3010b5 am 2ce1d81f: Merge "liblog: __android_log_is_loggable support Developer Options" 
* commit '2ce1d81fd412657c14a14dd43ec570ac65cc1874':
  liblog: __android_log_is_loggable support Developer Options
 2015-04-23 21:16:40 +00:00
Mark Salyzyn
2ce1d81fd4 Merge "liblog: __android_log_is_loggable support Developer Options" 2015-04-23 21:06:31 +00:00
Mark Salyzyn
2766099959 am 653f9581: Merge "logd: per UID less aggressive 12.5% threshold" 
* commit '653f9581bf32cc2532c2b1d442d7bb2bbf0c173e':
  logd: per UID less aggressive 12.5% threshold
 2015-04-23 14:50:42 +00:00
Mark Salyzyn
653f9581bf Merge "logd: per UID less aggressive 12.5% threshold" 2015-04-23 14:41:48 +00:00
Mark Salyzyn
f94727b4c6 am 40502e1a: Merge "logd: ratelimit drop messages to 1/sec" 
* commit '40502e1a70a0705ee9fbc50951bfae3c6b662632':
  logd: ratelimit drop messages to 1/sec
 2015-04-23 14:38:52 +00:00
Mark Salyzyn
40502e1a70 Merge "logd: ratelimit drop messages to 1/sec" 2015-04-23 14:30:44 +00:00
Elliott Hughes
d1eec0de6a am 876881b2: Merge "Add missing null checks after allocations." 
* commit '876881b22ad5d735cdb3ae2ac1afa6c336378808':
  Add missing null checks after allocations.
 2015-04-22 20:17:35 +00:00
Elliott Hughes
876881b22a Merge "Add missing null checks after allocations." 2015-04-22 20:05:46 +00:00
Mark Salyzyn
e06a6e0f26 logd: ratelimit drop messages to 1/sec 
Bug: 20334069
Bug: 20370119
Change-Id: I6f850aec46c4df1c99a5b1f28db75d071e134ad5
 2015-04-22 11:58:37 -07:00
Mark Salyzyn
d717d805d4 logd: per UID less aggressive 12.5% threshold 
Per-UID quota has a threshold of 12.5% of the total log size.
If less than that space is taken by the UID, then we
will not engage the pruning based on worst UID.

Change-Id: I9f15c9a26938f1115eb75e9c28ddb073e7680e06
 2015-04-22 11:53:29 -07:00
Mark Salyzyn
1f028b2fdf liblog: __android_log_is_loggable support Developer Options 
- If logd.tag.<tag> is not found, check if persist.logd.tag.<tag> is available
- Do not turn off the isLoggable functionality on "user" builds

Bug: 19544788
Bug: 17760225
Change-Id: I3fec67b547aa431438965519507033798398e1e1
 2015-04-22 10:39:39 -07:00
Richard Uhler
68f3a5a09f am f75f16a1: Merge "Fix typos in comments" 
* commit 'f75f16a1ddbe6cde5e44036d48dc7a6c62d38cc0':
  Fix typos in comments
 2015-04-22 16:17:31 +00:00
Richard Uhler
f75f16a1dd Merge "Fix typos in comments" 2015-04-22 16:07:22 +00:00
Elliott Hughes
421d01c895 am d4196ef8: Merge "Add a command to call libnetutils\' do_dhcp." 
* commit 'd4196ef88757a87af41c0f7ee6ed7bfc3802c9c7':
  Add a command to call libnetutils' do_dhcp.
 2015-04-22 02:57:58 +00:00
Elliott Hughes
d4196ef887 Merge "Add a command to call libnetutils' do_dhcp." 2015-04-22 02:50:13 +00:00