Chih-hung Hsieh
495c1c9d2f
am 2d241ec8: am 3a387176: Merge "Don\'t build init with clang for now"
...
* commit '2d241ec8a86c56bbf8522eb007674d7b4e3d164d':
Don't build init with clang for now
2014-10-16 16:32:04 +00:00
Chih-hung Hsieh
2d241ec8a8
am 3a387176: Merge "Don\'t build init with clang for now"
...
* commit '3a3871769130428bc1b8f3de03be7231750e1b82':
Don't build init with clang for now
2014-10-16 16:27:07 +00:00
Chih-hung Hsieh
3a38717691
Merge "Don't build init with clang for now"
2014-10-16 16:22:03 +00:00
Dianne Hackborn
e4f3805b29
am 1a27d6ab: am 6d343432: am 67f46cb0: Fix issue #18000467 : processgroup truncates buffer
...
* commit '1a27d6ab328676bf648da74fe78836e7c1ffc8e2':
Fix issue #18000467 : processgroup truncates buffer
2014-10-15 23:57:18 +00:00
Dianne Hackborn
1a27d6ab32
am 6d343432: am 67f46cb0: Fix issue #18000467 : processgroup truncates buffer
...
* commit '6d34343263d890114410fafc85885501eca8d3d6':
Fix issue #18000467 : processgroup truncates buffer
2014-10-15 23:25:11 +00:00
Dianne Hackborn
6d34343263
am 67f46cb0: Fix issue #18000467 : processgroup truncates buffer
...
* commit '67f46cb0e137edbf4a6f7014ca8a3a58484016d1':
Fix issue #18000467 : processgroup truncates buffer
2014-10-15 23:15:11 +00:00
Dianne Hackborn
67f46cb0e1
Fix issue #18000467 : processgroup truncates buffer
...
Change-Id: I3d98a4da9c47d83d25a11ff0ef94cfcab1feabea
2014-10-15 11:36:28 -07:00
Chih-Hung Hsieh
6ea35520fd
am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bodies."
...
* commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd':
Do not inline rarely used trace function bodies.
2014-10-15 17:57:07 +00:00
Chih-Hung Hsieh
07f1300c4c
am 7979f1ce: Merge "Do not inline rarely used trace function bodies."
...
* commit '7979f1ce5fd771aa9814ef7390f290201ae0790d':
Do not inline rarely used trace function bodies.
2014-10-15 17:54:19 +00:00
Chih-Hung Hsieh
7979f1ce5f
Merge "Do not inline rarely used trace function bodies."
2014-10-15 17:49:03 +00:00
Mark Salyzyn
1d6e7336b5
am 4f083c61: am a8aad166: Merge "logd: insert order for first entry"
...
* commit '4f083c6156cb59eddcb52094da7972f16dde2220':
logd: insert order for first entry
2014-10-15 00:07:59 +00:00
Mark Salyzyn
4f083c6156
am a8aad166: Merge "logd: insert order for first entry"
...
* commit 'a8aad1667ff191cbc3972c40e8f9ec960db4ef96':
logd: insert order for first entry
2014-10-15 00:01:39 +00:00
Mark Salyzyn
a8aad1667f
Merge "logd: insert order for first entry"
2014-10-14 23:57:33 +00:00
Mark Salyzyn
eae155e1ce
logd: insert order for first entry
...
Change-Id: I39e8e6d32407a1796a0c3a121f9dc4dc5402c3df
2014-10-14 23:57:13 +00:00
Chih-Hung Hsieh
2d3150e736
Do not inline rarely used trace function bodies.
...
When atrace_* functions are inlined,
the rarely used 1024-byte buffers are allocated on stack.
BUG: 17444504
Change-Id: I773512aeb70e8b79f3803c6d59cba064d2aa65b6
2014-10-14 15:37:20 -07:00
Dianne Hackborn
008b335097
am 00ffc22c: am e09bfb12: am 2c5e7e10: Maybe fix issue #17969789 : Shamu FR: Runtime restart while scrolling Instagram
...
* commit '00ffc22cbf1809b730ea0c8e849437db1abf8196':
Maybe fix issue #17969789 : Shamu FR: Runtime restart while scrolling Instagram
2014-10-14 19:43:51 +00:00
Dianne Hackborn
00ffc22cbf
am e09bfb12: am 2c5e7e10: Maybe fix issue #17969789 : Shamu FR: Runtime restart while scrolling Instagram
...
* commit 'e09bfb1213b9174d4c3d6536b755d924772ce881':
Maybe fix issue #17969789 : Shamu FR: Runtime restart while scrolling Instagram
2014-10-14 19:33:06 +00:00
Dmitriy Ivanov
b307dcd871
resolved conflicts for merge of 3f95c89d to lmp-mr1-dev-plus-aosp
...
Change-Id: Iac27dc93675c3111129fc594eaaff7f1d6f5c26f
2014-10-14 11:05:28 -07:00
Dmitriy Ivanov
3f95c89db6
am e63fb8bd: Merge "Remove libsigchain from LD_PRELOADs"
...
* commit 'e63fb8bd8086a280cae61612da965cb13e75194f':
Remove libsigchain from LD_PRELOADs
2014-10-14 17:43:22 +00:00
Dmitriy Ivanov
e63fb8bd80
Merge "Remove libsigchain from LD_PRELOADs"
2014-10-14 17:39:22 +00:00
Dianne Hackborn
e09bfb1213
am 2c5e7e10: Maybe fix issue #17969789 : Shamu FR: Runtime restart while scrolling Instagram
...
* commit '2c5e7e102bc2059d22f8457db68c567b64cec963':
Maybe fix issue #17969789 : Shamu FR: Runtime restart while scrolling Instagram
2014-10-14 01:19:29 +00:00
Dianne Hackborn
2c5e7e102b
Maybe fix issue #17969789 : Shamu FR: Runtime restart while scrolling Instagram
...
It looks like there were a couple problems in the code:
- It would not 0-terminate the string it read, to make sure we didn't
see garbage at the end.
- It didn't reduce buf_len as it processes data in the buffer, so if
we need to read more we will increase the buffer length to be longer
than the actual available data.
Also put in some logs about every thing we kill, so we can see what
is going on when debugging. And add a special check for us trying
to kill pid 0 for any reason, since doing so seem to be terminal to
the caller.
Change-Id: I2fe29bfef08938b8a2eb182475c0705c14d8d84f
2014-10-13 17:52:32 -07:00
Riley Andrews
5d678db3c6
am e7502d32: am 3bcd5694: Merge "Add gtest conformance tests for libsync."
...
* commit 'e7502d32cfb2f26e24183c709ccfece67bc815e3':
Add gtest conformance tests for libsync.
2014-10-11 19:48:35 +00:00
Riley Andrews
e7502d32cf
am 3bcd5694: Merge "Add gtest conformance tests for libsync."
...
* commit '3bcd569490bceb2c1f2bdd8d6852680e12dedc9f':
Add gtest conformance tests for libsync.
2014-10-11 19:44:46 +00:00
Riley Andrews
3bcd569490
Merge "Add gtest conformance tests for libsync."
2014-10-11 19:40:32 +00:00
Daniel Rosenberg
9011c1bc7a
am 86b4dba9: am b63aab58: am 8218b6aa: newfs_msdos: Set sectors per fat once
...
* commit '86b4dba9c48841659c566ac71a034230f02ec259':
newfs_msdos: Set sectors per fat once
2014-10-11 04:55:01 +00:00
Daniel Rosenberg
86b4dba9c4
am b63aab58: am 8218b6aa: newfs_msdos: Set sectors per fat once
...
* commit 'b63aab58065f5fb2a04c5d7c49f1d61bf7e17179':
newfs_msdos: Set sectors per fat once
2014-10-11 02:49:40 +00:00
Riley Andrews
d0d7f6ac08
Add gtest conformance tests for libsync.
...
Not complete yet, but substantially more comprehensive than the
interactive test that was there before.
(cherry-picked from internal master, same change-id).
Change-Id: I9019b0a8babbc91f78aa850e0e288bbf05f93500
2014-10-11 02:10:23 +00:00
Daniel Rosenberg
b63aab5806
am 8218b6aa: newfs_msdos: Set sectors per fat once
...
* commit '8218b6aae9cd4a19fa074a8a8203fe9275b35447':
newfs_msdos: Set sectors per fat once
2014-10-11 00:23:52 +00:00
Daniel Rosenberg
8218b6aae9
newfs_msdos: Set sectors per fat once
...
There was an issue causing the fat size to shrink too small, causing
a fsck check to fail.
Bug: 17949028
Bug: 17761281
Change-Id: Id0207f2ab44e57ff81f5a53494b45344822a6495
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-10-10 14:40:48 -07:00
Paul Lawrence
a1ab5a8ecf
am 97e48731: Fix Nick\'s nits
...
* commit '97e487311b1cb780dfd3b0994917c72047d6188f':
Fix Nick's nits
2014-10-10 18:44:53 +00:00
Paul Lawrence
6e9857da67
resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aosp
...
Change-Id: I6b62347c3acfda7c2c954e719547021009d20c01
2014-10-10 09:07:21 -07:00
Paul Lawrence
c638c6647d
resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aosp
...
Change-Id: I9ff777a6309aab2b5b18323dd4ee7617cb1c3180
2014-10-09 15:17:23 -07:00
Mark Salyzyn
c7fb2ce7d3
am fd4f05ce: Merge changes I74796043,I7d0b85b5,I74796043,I74796043,Ie325e1b5, ... into lmp-mr1-dev
...
* commit 'fd4f05ce058cfff745c1edbe06d0703cc4a2954d':
logd: kill(0,0) issue
logd: LogStatistics leak
logd: Add control statistics enable/disable.
logd: cleanup
logd: auditd: report facility LOG_AUTH
logd: auditd: kmsg priority
2014-10-09 21:41:30 +00:00
Paul Lawrence
cc496dbcd7
resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aosp
...
Change-Id: Icdc9306b460c116441aad21bfcf3ab549224a141
2014-10-09 13:24:06 -07:00
Paul Lawrence
97e487311b
Fix Nick's nits
...
Change-Id: Ide7925e7ad328f0343d444d63ff72f1a26206d4c
2014-10-09 09:37:00 -07:00
Paul Lawrence
bbb3631911
Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""
...
This reverts commit 152d2d4234 .
Fixed build error, and also fixed memory leak spotted from warning.
Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
2014-10-09 09:05:36 -07:00
Mark Salyzyn
3e64bf45e6
am af191cd1: am 6b66025f: Merge "fs_mgr: fix build breakage"
...
* commit 'af191cd157f076ee5d99890711e2881a60d7770a':
fs_mgr: fix build breakage
2014-10-09 14:25:32 +00:00
Mark Salyzyn
af191cd157
am 6b66025f: Merge "fs_mgr: fix build breakage"
...
* commit '6b66025f6f3e48d182e8d6aeb989d0f39eb551e3':
fs_mgr: fix build breakage
2014-10-09 14:20:05 +00:00
Mark Salyzyn
6b66025f6f
Merge "fs_mgr: fix build breakage"
2014-10-09 14:14:55 +00:00
Nick Kralevich
a49bfc0d26
Merge "Revert "Enable verity on userdebug, and add disable-verity to adb"" into lmp-mr1-dev
2014-10-08 23:59:00 +00:00
Nick Kralevich
152d2d4234
Revert "Enable verity on userdebug, and add disable-verity to adb"
...
Build is broken.
system/core/fs_mgr/fs_mgr_verity.c: In function 'fs_mgr_setup_verity':
system/core/fs_mgr/fs_mgr_verity.c:103:20: error: 'verity_table_signature' may be used uninitialized in this function [-Werror=maybe-uninitialized]
if (!RSA_verify(key,
^
system/core/fs_mgr/fs_mgr_verity.c:374:11: note: 'verity_table_signature' was declared here
char *verity_table_signature;
^
cc1: all warnings being treated as errors
make: *** [out/target/product/minnow/obj/STATIC_LIBRARIES/libfs_mgr_intermediates/fs_mgr_verity.o] Error 1
make: *** Waiting for unfinished jobs....
This reverts commit d4cea0bc16 .
Change-Id: I6862cc79ef9d944a2472b6fb2e46dae514cea8ce
2014-10-08 23:55:05 +00:00
Mark Salyzyn
89fa114e2a
fs_mgr: fix build breakage
...
Some compilers are not as smart as other compilers
Change-Id: I9d93c73bdbd2dca37373d8a42a2ed510d0559274
2014-10-08 16:43:47 -07:00
Mark Salyzyn
fd4f05ce05
Merge changes I74796043,I7d0b85b5,I74796043,I74796043,Ie325e1b5, ... into lmp-mr1-dev
...
* changes:
logd: kill(0,0) issue
logd: LogStatistics leak
logd: Add control statistics enable/disable.
logd: cleanup
logd: auditd: report facility LOG_AUTH
logd: auditd: kmsg priority
2014-10-08 23:07:07 +00:00
Paul Lawrence
ae413a71cb
Merge "Enable verity on userdebug, and add disable-verity to adb" into lmp-mr1-dev
2014-10-08 22:57:15 +00:00
Paul Lawrence
d4cea0bc16
Enable verity on userdebug, and add disable-verity to adb
...
Bug: 17691572
Change-Id: I58f588f318e7952d06a41325337d946d7c007e31
2014-10-08 15:24:37 -07:00
Mark Salyzyn
260f3be312
logd: kill(0,0) issue
...
- Recognize pid=0 as special case (kernel or pre-init sourced)
and refrain from treating it in the general case.
(cherry pick from commit df5aa61f05 )
Bug: 17526159
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e012
2014-10-08 14:01:45 -07:00
Mark Salyzyn
1e1d71e26c
logd: LogStatistics leak
...
- uid = -1 in subtract operation to match add
(cherry pick from commit f48ea7c8dc )
Bug: 15986335
Change-Id: I7d0b85b5334c5264fd04309cb78e0c9aec0ad261
2014-10-08 14:01:45 -07:00
Mark Salyzyn
a0e53540da
logd: Add control statistics enable/disable.
...
- ro.build.type=user turn off statistics
- ro.config.low_ram=true turn off statistics
- logd.statistics override
(cherry pick from commit f5fc509589 )
Bug: 17526159
Bug: 17526187
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e00f
2014-10-08 14:01:45 -07:00
Mark Salyzyn
987f1e0de3
logd: cleanup
...
- simplify access and control exposure to class list
- indent
- compile warning
- Follow standard naming convention for variables and methods
- merge common fragments
- Side Effects: none
(cherry pick from commit e72c6e4366 )
Bug: 17526159
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e010
2014-10-08 14:01:45 -07:00