Elliott Hughes
cf96dc867d
am 5848c458: am f69624a1: Merge "Remove dead files."
...
* commit '5848c4589a256bef0ecfda2df3ce53c3e980309b':
Remove dead files.
2015-05-13 15:21:45 +00:00
Narayan Kamath
b284a003d6
am 241bcf05: Fix file descriptor leak when opening invalid archives.
...
* commit '241bcf05e0e394bbf2681f359f52646dd6c707f6':
Fix file descriptor leak when opening invalid archives.
2015-05-13 09:46:11 +00:00
Narayan Kamath
241bcf05e0
Fix file descriptor leak when opening invalid archives.
...
Also add -Wunreachable-code to the set of compiler flags, otherwise
noreturn becomes considerably less useful.
bug: https://code.google.com/p/android/issues/detail?id=171099
Change-Id: I9a95d45633c731c7046d4e4a39844d9cebfd1718
2015-05-13 09:20:44 +00:00
Terry Heo
e4c6666ea9
am 55431d97: Merge "rootdir: add permission for /dev/dvb*" into mnc-dev
...
* commit '55431d97459210f0f4ac66538ca6cbf8cf3511e9':
rootdir: add permission for /dev/dvb*
2015-05-13 06:06:37 +00:00
Terry Heo
55431d9745
Merge "rootdir: add permission for /dev/dvb*" into mnc-dev
2015-05-13 05:46:53 +00:00
Elliott Hughes
2550355ceb
resolved conflicts for merge of d410a9b3 to mnc-dev-plus-aosp
...
Change-Id: I2e8e6c9a2024e0a753d3912111ccd1c2bfbfef10
2015-05-12 20:16:40 -07:00
Elliott Hughes
d410a9b323
Merge changes Ie9d9a7ad,If7479bdc into mnc-dev
...
* changes:
Fix insmod module size
Enable property expansion for insmod
2015-05-13 02:45:59 +00:00
Tom Cherry
cce7e93b28
Fix insmod module size
...
read_file() used to append a new line character to the end of the buffer it
returns, because parse_config() isn't able to cope with input that's not
'\n'-terminated. Fix read_file() to be less insane, and push the workarounds
into the parse_config() callers.
Longer term we should rewrite parse_config().
Bug: http://b/21079470
Change-Id: Ie9d9a7adcd33b66621726aef20c4b8cc51c08be7
(cherry picked from commit eaa3b4ec6f )
2015-05-12 19:42:38 -07:00
Mark Salyzyn
867ea48a8a
am ff32f3c7: logd: Add Tag statistics
...
* commit 'ff32f3c77439b9791e58c225a8b7ca82dfc2c3da':
logd: Add Tag statistics
2015-05-12 22:59:56 +00:00
Mark Salyzyn
ff32f3c774
logd: Add Tag statistics
...
(cherry pick from commit 344bff4391 )
- Optional class of statistics for events Tags
- export tagToName from LogBuffer (located in main.cp to address
https://android-review.googlesource.com/#/c/110204 )
- Can not handle dropped because getTag() can not work,
will need to be fixed if we start filtering.
Bug: 19608965
Change-Id: I7b90607ca588bf37bab71f19b1570a290e772776
2015-05-12 15:34:56 -07:00
Emmanuel Berthier
30cc3d7249
Enable property expansion for insmod
...
Useful for dynamic kernel module location.
This permits to use init rule like:
insmod ${persist.modules.location}/<module_name>
Change-Id: If7479bdcb4e69ea7666f52a0075c785be025c2e9
Signed-off-by: Emmanuel Berthier <emmanuel.berthier@intel.com>
(cherry picked from commit ac41230cbc )
2015-05-12 15:01:02 -07:00
Mark Salyzyn
35db470eb5
am 4fba2867: logd: pidToName deficiency
...
* commit '4fba28671b7213010dbfe6ad88e9891cc4080c75':
logd: pidToName deficiency
2015-05-12 20:30:32 +00:00
Mark Salyzyn
4fba28671b
logd: pidToName deficiency
...
(Cherry pick from commit aa43ae2268 )
any logging in zygote permanently sets the pidToName
Change-Id: I0b8fdc96fb5965a04d4dc4293c39815beef5eb8e
2015-05-12 13:06:25 -07:00
Mark Salyzyn
1cfb238412
am 9bdc0647: logd: uidToName add dex2oat UID
...
* commit '9bdc0647200bfcd64962a5d2bde39f01f2fd0457':
logd: uidToName add dex2oat UID
2015-05-12 17:20:33 +00:00
Mark Salyzyn
9bdc064720
logd: uidToName add dex2oat UID
...
(cherry pick from commit 023f51f360 )
- When searching for uidToName from /data/system/packages.list
one must search for the uid % AID_USER;
- If uid % AID_USER is greater than AID_SHARED_GID_START - AID_APP,
then subract it and try again to pick up uidToName.
Change-Id: I24df42957ff7e746fffa5d39484637b1b726b9c0
2015-05-12 09:55:02 -07:00
Elliott Hughes
5848c4589a
am f69624a1: Merge "Remove dead files."
...
* commit 'f69624a1ef6d1792d73c32cc985362458f1b7442':
Remove dead files.
2015-05-12 14:50:39 +00:00
Elliott Hughes
f69624a1ef
Merge "Remove dead files."
2015-05-12 14:43:01 +00:00
Elliott Hughes
fe93e8d2a7
Remove dead files.
...
Auto-imported from cupcake, not touched since then, or used anyway.
Change-Id: If2d50cddff0238dff818c7bae92fe8e1100fccdf
2015-05-11 21:57:33 -07:00
Mark Salyzyn
9992aa8add
am ff1f639c: am 80b129f9: Merge "logd: uidToName add dex2oat UID"
...
* commit 'ff1f639c801983a364c7c89355de0b83a3f43485':
logd: uidToName add dex2oat UID
2015-05-12 00:13:02 +00:00
Mark Salyzyn
ff1f639c80
am 80b129f9: Merge "logd: uidToName add dex2oat UID"
...
* commit '80b129f9f08ce9d8b4e315a4413dda61e5dbdd75':
logd: uidToName add dex2oat UID
2015-05-12 00:01:53 +00:00
Mark Salyzyn
80b129f9f0
Merge "logd: uidToName add dex2oat UID"
2015-05-11 23:51:32 +00:00
Elliott Hughes
c74b53590b
am 1c9bfdae: am adffad25: Merge "adb: Do not share memory between multiple thread"
...
* commit '1c9bfdae21b6319679a592a877deef1f03e1fed7':
adb: Do not share memory between multiple thread
2015-05-11 23:50:07 +00:00
Elliott Hughes
1c9bfdae21
am adffad25: Merge "adb: Do not share memory between multiple thread"
...
* commit 'adffad25a5464b65f9c58d3d06f7a7ac0bca04e2':
adb: Do not share memory between multiple thread
2015-05-11 23:37:30 +00:00
Elliott Hughes
adffad25a5
Merge "adb: Do not share memory between multiple thread"
2015-05-11 23:30:26 +00:00
Alan Jeon
4af3c40c4a
adb: Do not share memory between multiple thread
...
When multiple client try to connect to other hosts, it failed because
memory corruption. Allocate memory for each thread like other command did.
Change-Id: I79959ce3dbfd11c7553736cd3f5a899815873584
Signed-off-by: Alan Jeon <skyisle@gmail.com>
2015-05-11 16:28:04 -07:00
Nick Kralevich
05867d77be
am 6de7a06a: Revert "libaudit: limit to 5 selinux denials per sec"
...
* commit '6de7a06afb3f70abe1517fc55efd1a11110e5197':
Revert "libaudit: limit to 5 selinux denials per sec"
2015-05-11 23:07:19 +00:00
Nick Kralevich
ee0c814ac7
am 88e184d9: am 97d0c193: Merge "Revert "libaudit: limit to 5 selinux denials per sec""
...
* commit '88e184d981955c6b1851ae9e0c4f08f61a021563':
Revert "libaudit: limit to 5 selinux denials per sec"
2015-05-11 23:01:51 +00:00
Nick Kralevich
88e184d981
am 97d0c193: Merge "Revert "libaudit: limit to 5 selinux denials per sec""
...
* commit '97d0c1935447b4fc91bd59f604ab92e9e579efa3':
Revert "libaudit: limit to 5 selinux denials per sec"
2015-05-11 22:50:29 +00:00
Nick Kralevich
6de7a06afb
Revert "libaudit: limit to 5 selinux denials per sec"
...
The shamu instabilities continued even after throttling SELinux denials
to 5/second. 5 denials per second is too low when doing device bringup,
and there have been some complaints about lost SELinux denials. See,
for example, http://comments.gmane.org/gmane.comp.security.selinux/21941
Bring the limit back up to 20/second to prevent dropping too many
denials on the floor.
This reverts commit a15db51bbf .
(cherrypick of commit 9667a66019 )
Change-Id: I05e85cce0a792d05aa557fcc614c0fc019c15014
2015-05-11 15:43:25 -07:00
Nick Kralevich
97d0c19354
Merge "Revert "libaudit: limit to 5 selinux denials per sec""
2015-05-11 22:38:58 +00:00
Elliott Hughes
1c9f1f562d
am a66426ce: am 85abaf66: Merge "Failure to find an oem partition should not be a remount failure."
...
* commit 'a66426ce50b099cfaa199a2e5e2c92c041d2f682':
Failure to find an oem partition should not be a remount failure.
2015-05-11 20:59:56 +00:00
Elliott Hughes
9fef23aaa8
am a51d8b9a: Failure to find an oem partition should not be a remount failure.
...
* commit 'a51d8b9a1c06a17b8d5d5fd9547a3bf813ea4157':
Failure to find an oem partition should not be a remount failure.
2015-05-11 20:58:50 +00:00
Elliott Hughes
a66426ce50
am 85abaf66: Merge "Failure to find an oem partition should not be a remount failure."
...
* commit '85abaf66c499a44326d83d488f4b4f5add235f4a':
Failure to find an oem partition should not be a remount failure.
2015-05-11 20:47:43 +00:00
Elliott Hughes
a51d8b9a1c
Failure to find an oem partition should not be a remount failure.
...
Many devices don't have an /oem partition, so find_mount should be
expected to fail, but shouldn't cause the overall remount to fail.
Also clean up all the error handling and reporting, and remove the
dead int* globals.
Bug: http://b/21024141
Change-Id: Ie31021b03c9cab8e972269d7d1ffe383cd30ee9e
(cherry picked from commit 9aa4fda4e6 )
2015-05-11 13:36:13 -07:00
Elliott Hughes
85abaf66c4
Merge "Failure to find an oem partition should not be a remount failure."
2015-05-11 20:32:56 +00:00
Elliott Hughes
9aa4fda4e6
Failure to find an oem partition should not be a remount failure.
...
Many devices don't have an /oem partition, so find_mount should be
expected to fail, but shouldn't cause the overall remount to fail.
Also clean up all the error handling and reporting, and remove the
dead int* globals.
Bug: http://b/21024141
Change-Id: Ie31021b03c9cab8e972269d7d1ffe383cd30ee9e
2015-05-11 13:28:22 -07:00
Mark Salyzyn
977922252f
am b8da6942: am b51546f4: Merge "liblog: Add kernel log id"
...
* commit 'b8da694214515228c487d45f7edc210e77e257b5':
liblog: Add kernel log id
2015-05-11 16:28:31 +00:00
Mark Salyzyn
b8da694214
am b51546f4: Merge "liblog: Add kernel log id"
...
* commit 'b51546f43f8288ffa5cdfc01e10c20a46a5cfe96':
liblog: Add kernel log id
2015-05-11 16:15:28 +00:00
Mark Salyzyn
b51546f43f
Merge "liblog: Add kernel log id"
2015-05-11 16:09:04 +00:00
Nick Kralevich
9667a66019
Revert "libaudit: limit to 5 selinux denials per sec"
...
The shamu instabilities continued even after throttling SELinux denials
to 5/second. 5 denials per second is too low when doing device bringup,
and there have been some complaints about lost SELinux denials. See,
for example, http://comments.gmane.org/gmane.comp.security.selinux/21941
Bring the limit back up to 20/second to prevent dropping too many
denials on the floor.
This reverts commit a15db51bbf .
Change-Id: I05e85cce0a792d05aa557fcc614c0fc019c15014
2015-05-09 12:41:41 -07:00
Andres Morales
7c6fd11e9a
am e9fd9b23: am 1da6b1fe: Merge "load ro.recovery_id property from recovery partition"
...
* commit 'e9fd9b23cbc0c0aa3919b3e06871ad98ecb0d33b':
load ro.recovery_id property from recovery partition
2015-05-09 01:25:33 +00:00
Andres Morales
e9fd9b23cb
am 1da6b1fe: Merge "load ro.recovery_id property from recovery partition"
...
* commit '1da6b1fe64d8ca13862e56db120ea201d51c284e':
load ro.recovery_id property from recovery partition
2015-05-09 01:15:02 +00:00
Andres Morales
1da6b1fe64
Merge "load ro.recovery_id property from recovery partition"
2015-05-09 01:05:39 +00:00
Dan Albert
58bc0cb1c1
am 9d470fc7: am dd6f7b8d: Merge "Revert "Revert "Split adb_main.cpp into client and daemon."""
...
* commit '9d470fc776cf5fefd9800db66e25ad29850c3b43':
Revert "Revert "Split adb_main.cpp into client and daemon.""
2015-05-09 00:57:35 +00:00
Andres Morales
b7f8b91040
am 86aeb11e: Merge "load ro.recovery_id property from recovery partition" into mnc-dev
...
* commit '86aeb11ed047b3698948c4eee8fbaccd20131ecb':
load ro.recovery_id property from recovery partition
2015-05-09 00:46:52 +00:00
Dan Albert
9d470fc776
am dd6f7b8d: Merge "Revert "Revert "Split adb_main.cpp into client and daemon."""
...
* commit 'dd6f7b8dd7326529cc3c43afff728017561d5c9c':
Revert "Revert "Split adb_main.cpp into client and daemon.""
2015-05-09 00:46:45 +00:00
Andres Morales
cb3fce80fa
load ro.recovery_id property from recovery partition
...
Change-Id: I9dc1f325e353375d9c1c8ed949636e2404601076
(cherry picked from commit db5f5d4367 )
2015-05-08 17:35:13 -07:00
Dan Albert
dd6f7b8dd7
Merge "Revert "Revert "Split adb_main.cpp into client and daemon."""
2015-05-09 00:33:49 +00:00
Dan Albert
c89e0ccd40
Revert "Revert "Split adb_main.cpp into client and daemon.""
...
This reverts commit 218dbccefa .
Change-Id: I74088db34983dc99e316a07c6ddc294340e0eb71
2015-05-08 17:33:21 -07:00
Andres Morales
86aeb11ed0
Merge "load ro.recovery_id property from recovery partition" into mnc-dev
2015-05-09 00:25:54 +00:00