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

6316 commits

This branch
This branch
All branches
Author SHA1 Message Date
Todd Poynor
aacded7019 init.rc: start lmkd 
Change-Id: Ibebab31e1f41a210821834a1d65f196b39bb6601
 2013-08-30 15:32:09 -07:00
Todd Poynor
3948f80f2a Add lmkd low memory killer daemon 
Move kernel low memory killer logic to new daemon lmkd.  ActivityManager
communicates with this daemon over a named socket.

Change-Id: Ie957da7e9b1f7150e23c689fdadf23ff260b47be
 2013-08-30 15:32:09 -07:00
Jeff Sharkey
3912701e5e am 78c984ae: am 5835ac9e: Merge "Only check caller when deriving permissions." into klp-dev 
* commit '78c984aef222654bd337ae7f466a526e23db8f07':
  Only check caller when deriving permissions.
 2013-08-30 14:13:44 -07:00
Jeff Sharkey
78c984aef2 am 5835ac9e: Merge "Only check caller when deriving permissions." into klp-dev 
* commit '5835ac9e31aea910adb6b9d2de1d63df771df45b':
  Only check caller when deriving permissions.
 2013-08-30 14:08:49 -07:00
Jeff Sharkey
5835ac9e31 Merge "Only check caller when deriving permissions." into klp-dev 2013-08-30 21:03:41 +00:00
Jeff Sharkey
39ff0ae0f6 Only check caller when deriving permissions. 
Bug: 10547597
Change-Id: Ied909f9047c2567e93dde0f4658d6e4b9ff161ab
 2013-08-30 13:58:13 -07:00
Jeff Sharkey
5c0ae41778 am ab977264: am 5856fd89: Merge "Fix recursive locking bug." into klp-dev 
* commit 'ab9772641cad9342e615b21e5a4afb665e40cacf':
  Fix recursive locking bug.
 2013-08-30 13:07:44 -07:00
Jeff Sharkey
ab9772641c am 5856fd89: Merge "Fix recursive locking bug." into klp-dev 
* commit '5856fd8935b8aa499930daed29105f6419a96a5e':
  Fix recursive locking bug.
 2013-08-30 13:05:37 -07:00
Jeff Sharkey
5856fd8935 Merge "Fix recursive locking bug." into klp-dev 2013-08-30 20:03:19 +00:00
Jeff Sharkey
aa04e818a4 Fix recursive locking bug. 
handle_rename() would end up acquiring the lock twice.  Change to
always derive has_rw inside earlier locks (instead of acquiring a
second time), and pass the value into check_caller_access_to_name().

Bug: 10547597
Change-Id: If5744d6d226a4785676c19d0f7fdf1c05060ed76
 2013-08-30 10:28:21 -07:00
Dima Zavin
f8f64988dd am c3c03f12: am 28e52c81: am b35f68a6: Merge "init: load factory properties" 
* commit 'c3c03f12ad5397588af639178ad200b56787790a':
  init: load factory properties
 2013-08-28 14:48:10 -07:00
Dima Zavin
c3c03f12ad am 28e52c81: am b35f68a6: Merge "init: load factory properties" 
* commit '28e52c816d06d78fa823be2d310d9f4c25012c8f':
  init: load factory properties
 2013-08-28 14:14:59 -07:00
Dima Zavin
28e52c816d am b35f68a6: Merge "init: load factory properties" 
* commit 'b35f68a6974589fc3c762d6d2c7bac363794e355':
  init: load factory properties
 2013-08-28 14:12:19 -07:00
Dima Zavin
b35f68a697 Merge "init: load factory properties" 2013-08-28 21:08:43 +00:00
Alex Klyubin
61d1b4420c am f7f3955d: am 5f395624: am aed27f80: am b0739c66: Fix run-as which was broken in Android 4.3 
* commit 'f7f3955d4d7cf78914395ddb47400d1237bf4bc2':
  Fix run-as which was broken in Android 4.3
 2013-08-28 14:07:11 -07:00
Alex Klyubin
f7f3955d4d am 5f395624: am aed27f80: am b0739c66: Fix run-as which was broken in Android 4.3 
* commit '5f39562466688da2f6a0d6fc1588e8a3f5c54971':
  Fix run-as which was broken in Android 4.3
 2013-08-28 13:13:31 -07:00
Alex Klyubin
5f39562466 am aed27f80: am b0739c66: Fix run-as which was broken in Android 4.3 
* commit 'aed27f8018e4365aa52a5dd8e89c4db2df0273c5':
  Fix run-as which was broken in Android 4.3
 2013-08-28 13:11:00 -07:00
Alex Klyubin
aed27f8018 am b0739c66: Fix run-as which was broken in Android 4.3 
* commit 'b0739c662db6a19b49c0912b865edb2853156bda':
  Fix run-as which was broken in Android 4.3
 2013-08-28 13:07:48 -07:00
Elliott Hughes
e7aa5baef0 am b9264934: am 876f4366: am a7f6e015: Merge "correct msi usb vendor id." 
* commit 'b92649341718984bf91a09a3e9dddf04b844c567':
  correct msi usb vendor id.
 2013-08-28 08:39:05 -07:00
Elliott Hughes
b926493417 am 876f4366: am a7f6e015: Merge "correct msi usb vendor id." 
* commit '876f436668036e8e9d3f86434eee1a44ff5364b8':
  correct msi usb vendor id.
 2013-08-28 08:37:02 -07:00
Elliott Hughes
876f436668 am a7f6e015: Merge "correct msi usb vendor id." 
* commit 'a7f6e015a5cf2ac85549fe676d6641caf6af1291':
  correct msi usb vendor id.
 2013-08-28 08:35:16 -07:00
Elliott Hughes
a7f6e015a5 Merge "correct msi usb vendor id." 2013-08-28 15:31:51 +00:00
astonehuang
48c5d7b6cd correct msi usb vendor id. 
Change-Id: I13128531b8dd7758abddce47ce1c119381773c26
 2013-08-28 10:53:17 +08:00
Elliott Hughes
9950f549d6 am 9fe7014d: am bfe8e68a: am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue" 
* commit '9fe7014d056ac6478069d6f2e946ddbe2863d576':
  Fix build with gcc-4.8 and array boundaries issue
 2013-08-27 10:30:52 -07:00
Elliott Hughes
9fe7014d05 am bfe8e68a: am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue" 
* commit 'bfe8e68a251046fe9a0d9838f4cecaeea19eaa6c':
  Fix build with gcc-4.8 and array boundaries issue
 2013-08-27 10:15:50 -07:00
Elliott Hughes
bfe8e68a25 am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue" 
* commit '2e5157fa05dca31b2d409c185a6ca5230182503d':
  Fix build with gcc-4.8 and array boundaries issue
 2013-08-27 10:13:52 -07:00
Elliott Hughes
2e5157fa05 Merge "Fix build with gcc-4.8 and array boundaries issue" 2013-08-27 17:12:01 +00:00
Benoit Goby
13eca3ba1b am 3bb2be74: am f0eec130: am db71324a: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created" 
* commit '3bb2be7499bbefbb5b702eff974619067e1afd27':
  libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
 2013-08-26 15:24:24 -07:00
Benoit Goby
3bb2be7499 am f0eec130: am db71324a: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created" 
* commit 'f0eec1301dc629bfbaf71f1d2db8be0449d7ec97':
  libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
 2013-08-26 15:18:43 -07:00
Benoit Goby
b9b231081c am 7109fddc: am 7e18e456: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created" into klp-dev 
* commit '7109fddc43b2b9aa77f8c6849ebf4d09cb313706':
  libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
 2013-08-26 15:17:12 -07:00
Michael Wright
73d7b04220 am 2c8fa5ee: am 2f9c5fd4: Merge "Add standard options to readlink" into klp-dev 
* commit '2c8fa5eecf407107f951ba6aa9f618a794ef0a33':
  Add standard options to readlink
 2013-08-26 15:17:11 -07:00
Benoit Goby
f0eec1301d am db71324a: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created" 
* commit 'db71324a4f3538fa8716ec4d77b3a512598c0527':
  libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
 2013-08-26 15:15:42 -07:00
Benoit Goby
db71324a4f Merge "libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created" 2013-08-26 22:13:20 +00:00
Benoit Goby
7109fddc43 am 7e18e456: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created" into klp-dev 
* commit '7e18e45617b73c7a4081202115bb8e5a06ebb1c7':
  libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
 2013-08-26 15:05:47 -07:00
Michael Wright
2c8fa5eecf am 2f9c5fd4: Merge "Add standard options to readlink" into klp-dev 
* commit '2f9c5fd4b9676c59839c45bf4877551188dbc22a':
  Add standard options to readlink
 2013-08-26 15:03:07 -07:00
Benoit Goby
7e18e45617 Merge "libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created" into klp-dev 2013-08-26 21:58:04 +00:00
Ziv Hendel
8cc80fc894 libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created 
On some devices there is a slight delay between the creation of "/dev/bus"
and "/dev/bus/usb". Previously, the code assumed that both are created in the
same time which caused "watch_existing_subdirs" to fail and libusbhost to stop
working until the device is rebooted. The fix will setup an inotify event on the
creation of the "bus/usb" so it will not be missed once it's created.

Change-Id: I17f06dd167e61573307425e48898e12ebc954093
 2013-08-26 14:56:39 -07:00
Colin Cross
565eed9f7b am b69f8634: am 0cbaed42: am a8ba1f2f: Merge "Add support for socket security context specification." 
* commit 'b69f863455261a656da02343e8b9d55110ecd45f':
  Add support for socket security context specification.
 2013-08-23 18:43:21 -07:00
Colin Cross
b69f863455 am 0cbaed42: am a8ba1f2f: Merge "Add support for socket security context specification." 
* commit '0cbaed4211b514dd2aaa4d28f8936ba58e83c6a5':
  Add support for socket security context specification.
 2013-08-23 18:40:12 -07:00
Colin Cross
0cbaed4211 am a8ba1f2f: Merge "Add support for socket security context specification." 
* commit 'a8ba1f2f0b67063978819cc7d04276060450f364':
  Add support for socket security context specification.
 2013-08-23 18:37:57 -07:00
Colin Cross
a8ba1f2f0b Merge "Add support for socket security context specification." 2013-08-24 00:12:03 +00:00
Michael Wright
2f9c5fd4b9 Merge "Add standard options to readlink" into klp-dev 2013-08-23 23:19:56 +00:00
Colin Cross
a34f1391bd am 30caffc0: resolved conflicts for merge of a1af5cf6 to klp-dev-plus-aosp 
* commit '30caffc025aff450ebb354ee693174cc1732732b':
  Handle policy reloads within ueventd rather than restarting it.
 2013-08-23 14:42:21 -07:00
Colin Cross
30caffc025 resolved conflicts for merge of a1af5cf6 to klp-dev-plus-aosp 
Change-Id: I08e9898940f7cdd466469b76760807cc5d5c67e4
 2013-08-23 14:39:39 -07:00
Colin Cross
a1af5cf6d1 am d8d99c45: Merge "Handle policy reloads within ueventd rather than restarting it." 
* commit 'd8d99c45b704399d50ae0a5e4df938d825c70cfa':
  Handle policy reloads within ueventd rather than restarting it.
 2013-08-23 14:33:46 -07:00
Colin Cross
d8d99c45b7 Merge "Handle policy reloads within ueventd rather than restarting it." 2013-08-23 21:31:26 +00:00
Stephen Smalley
8348d279c7 Add support for socket security context specification. 
Add an optional argument to the socket option for specifying
a SELinux security context for the socket.  Normally the socket
security context is automatically computed from the service security
context or set using the seclabel option, but this facility allows
dealing with two scenarios that cannot be addressed using the existing
mechanisms:
1) Use of logwrapper to wrap a service.
In this case, init cannot determine the service security context
as it does not directly execute it and we do not want logwrapper
to run in the same domain as the service.

2) Situations where a service has multiple sockets and we want to
label them distinctly.

Change-Id: I7ae9088c326a2140e56a8044bfb21a91505aea11
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2013-08-23 08:35:43 -04:00
Jeff Brown
51cf3502f6 am 8ca2bf08: (-s ours) am 46a24db5: Remove input flinger stubs. (DO NOT MERGE) 
* commit '8ca2bf084209cf121f1d4b011ad4db3e35f35c82':
  Remove input flinger stubs.  (DO NOT MERGE)
 2013-08-22 19:36:01 -07:00
Jeff Brown
8ca2bf0842 am 46a24db5: Remove input flinger stubs. (DO NOT MERGE) 
* commit '46a24db563f46736f6e02c4d80656ab51d94ff77':
  Remove input flinger stubs.  (DO NOT MERGE)
 2013-08-22 19:34:04 -07:00
Jeff Brown
46a24db563 Remove input flinger stubs. (DO NOT MERGE) 
Bug: 10446930
Change-Id: I88b926380dbe1e866c0b87ec95b3489d87c5907b
 2013-08-22 18:38:35 -07:00