Nick Kralevich
d6069e21ee
am b706a8ac
: am 2db3cd3e
: am 46fee19c
: Merge "Revert "Make init re-exec itself for its SELinux domain transition.""
...
* commit 'b706a8acff9c62da7b4045374b93a8739671a8a0':
Revert "Make init re-exec itself for its SELinux domain transition."
2015-04-24 17:37:42 +00:00
Nick Kralevich
e203d278e4
am 22fed877
: am ac699569
: am f0b47920
: Merge "Revert "Remove now-unusable \'setcon\' command.""
...
* commit '22fed877d14862b1aa4c9c2f92a4c83be6d85ed4':
Revert "Remove now-unusable 'setcon' command."
2015-04-24 17:37:40 +00:00
Nick Kralevich
b706a8acff
am 2db3cd3e
: am 46fee19c
: Merge "Revert "Make init re-exec itself for its SELinux domain transition.""
...
* commit '2db3cd3e5e5957da4cf8429b7bbc9b6d36c934a5':
Revert "Make init re-exec itself for its SELinux domain transition."
2015-04-24 17:17:00 +00:00
Nick Kralevich
22fed877d1
am ac699569
: am f0b47920
: Merge "Revert "Remove now-unusable \'setcon\' command.""
...
* commit 'ac6995690a329fd07d434c7fce417d75b794df48':
Revert "Remove now-unusable 'setcon' command."
2015-04-24 17:16:59 +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
John Reck
e5fe50fb13
Merge "Move LinearAlloc to libhwui"
2015-04-24 14:32:45 +00:00
Elliott Hughes
203d806721
am 9e690e02
: am 301691c2
: am 659b7d63
: Merge "Remove now-unusable \'setcon\' command."
...
* commit '9e690e02872f0ac621c5c77ec266a8721030ff8b':
Remove now-unusable 'setcon' command.
2015-04-24 04:42:25 +00:00
Elliott Hughes
8e9b756eab
am 77260323
: am 20dfbb0f
: am fa66b4e1
: Merge "Remove long-obsolete file."
...
* commit '77260323e2e99a996351a98a44ef56db5f1e2767':
Remove long-obsolete file.
2015-04-24 04:42:23 +00:00
Elliott Hughes
9e690e0287
am 301691c2
: am 659b7d63
: Merge "Remove now-unusable \'setcon\' command."
...
* commit '301691c258cb7e1901eec835a55f227a5af8e5eb':
Remove now-unusable 'setcon' command.
2015-04-24 04:16:59 +00:00
Elliott Hughes
77260323e2
am 20dfbb0f
: am fa66b4e1
: Merge "Remove long-obsolete file."
...
* commit '20dfbb0fd1dbe467ecfde3309f1abdbb01608ead':
Remove long-obsolete file.
2015-04-24 04:16:58 +00: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
dac7f85d16
am 3d671000
: am 28693983
: am 1a39a994
: Merge "Correct magic number on umount2"
...
* commit '3d671000c7268fcfcaf5445734b88428af26c294':
Correct magic number on umount2
2015-04-24 04:01:13 +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
45a2329b2d
am 77434ab3
: am ef68fd3f
: am d4656784
: Merge "Make init re-exec itself for its SELinux domain transition."
...
* commit '77434ab362b3234accf16499aaf2a5340d568553':
Make init re-exec itself for its SELinux domain transition.
2015-04-24 03:51:12 +00:00
Elliott Hughes
3d671000c7
am 28693983
: am 1a39a994
: Merge "Correct magic number on umount2"
...
* commit '28693983510b140240e7b3e83c082e516b83896f':
Correct magic number on umount2
2015-04-24 03:39:31 +00:00
Elliott Hughes
77434ab362
am ef68fd3f
: am d4656784
: Merge "Make init re-exec itself for its SELinux domain transition."
...
* commit 'ef68fd3f807438fd9aae3b8f104f3a85ef9eb699':
Make init re-exec itself for its SELinux domain transition.
2015-04-24 03:28:45 +00: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
7076796cab
am 44f1356e
: am 85a9566f
: am 76520752
: Merge "rootfs: init.rc start logd parse error"
...
* commit '44f1356e42a64fefb194b5c74b62402f4ec2881e':
rootfs: init.rc start logd parse error
2015-04-23 23:16:39 +00:00
Mark Salyzyn
44f1356e42
am 85a9566f
: am 76520752
: Merge "rootfs: init.rc start logd parse error"
...
* commit '85a9566f7c1b9bcef150edc587a3e64b1196ffc8':
rootfs: init.rc start logd parse error
2015-04-23 22:45:50 +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
2b70a6501f
am 9277b011
: am 9d4b3010
: am 2ce1d81f
: Merge "liblog: __android_log_is_loggable support Developer Options"
...
* commit '9277b01138decd65cd98cd4265789369cb9797b7':
liblog: __android_log_is_loggable support Developer Options
2015-04-23 22:29:28 +00:00
Mark Salyzyn
b259b5fb86
am ef9a093f
: am 27660999
: am 653f9581
: Merge "logd: per UID less aggressive 12.5% threshold"
...
* commit 'ef9a093fddd989bc555485e169bc8cc8a2643a7e':
logd: per UID less aggressive 12.5% threshold
2015-04-23 22:29:27 +00:00
Mark Salyzyn
de9f330888
am 92391131
: am f94727b4
: am 40502e1a
: Merge "logd: ratelimit drop messages to 1/sec"
...
* commit '92391131c43ec59d174d95ccfab6944832d1cee7':
logd: ratelimit drop messages to 1/sec
2015-04-23 22:29:26 +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
John Reck
52fc3e9aa8
Move LinearAlloc to libhwui
...
Change-Id: I83a70959ed0dcab2237faaf1dddc02b5eb0363c9
2015-04-23 15:07:54 -07:00
Mark Salyzyn
9277b01138
am 9d4b3010
: am 2ce1d81f
: Merge "liblog: __android_log_is_loggable support Developer Options"
...
* commit '9d4b3010b5b8c9e6c155df2ec1da4a33992a1ebd':
liblog: __android_log_is_loggable support Developer Options
2015-04-23 21:27:59 +00: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
ef9a093fdd
am 27660999
: am 653f9581
: Merge "logd: per UID less aggressive 12.5% threshold"
...
* commit '2766099959799434b114f6272107df04f55493d8':
logd: per UID less aggressive 12.5% threshold
2015-04-23 15:01:07 +00:00
Mark Salyzyn
92391131c4
am f94727b4
: am 40502e1a
: Merge "logd: ratelimit drop messages to 1/sec"
...
* commit 'f94727b4c6b10be576e145415bd6493a5e81c4a1':
logd: ratelimit drop messages to 1/sec
2015-04-23 14:51:26 +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
81bb3cb0f5
am 8a457c79
: am d1eec0de
: am 876881b2
: Merge "Add missing null checks after allocations."
...
* commit '8a457c79276c65d1cc30fea929916986756a00b7':
Add missing null checks after allocations.
2015-04-23 00:56:33 +00:00
Elliott Hughes
8a457c7927
am d1eec0de
: am 876881b2
: Merge "Add missing null checks after allocations."
...
* commit 'd1eec0de6a4af9565673809eb3cf29a1eefdcdb8':
Add missing null checks after allocations.
2015-04-22 20:28:56 +00:00