Mohamad Ayyash
cbe5e79236
Add CASIO to approved vendor IDs am: 6c48349dee am: 1dec743e01 -s ours
...
am: 14ae3f2b50
2016-02-17 17:41:41 +00:00
Mohamad Ayyash
14ae3f2b50
Add CASIO to approved vendor IDs am: 6c48349dee
...
am: 1dec743e01
2016-02-17 17:34:55 +00:00
Mohamad Ayyash
1dec743e01
Add CASIO to approved vendor IDs
...
am: 6c48349dee
2016-02-17 07:01:15 +00:00
Mohamad Ayyash
6c48349dee
Add CASIO to approved vendor IDs
...
BUG: 27021418
Change-Id: I083447d3555891db4fced2171a0a747882c4435a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-02-16 20:14:01 -08:00
Lorenzo Colitti
47f619bc37
Merge "Tolerate RTM_DELADDR messages from deleted interfaces." into nyc-dev
...
am: 8bb06b6493
2016-02-17 03:09:08 +00:00
Lorenzo Colitti
8bb06b6493
Merge "Tolerate RTM_DELADDR messages from deleted interfaces." into nyc-dev
2016-02-17 03:06:57 +00:00
James Hawkins
985e34bbf1
Merge "bootstat: Add a few more bootreasons and rebase the index against index 1." into nyc-dev
...
am: def841933f
2016-02-17 01:26:49 +00:00
Samuel Tan
9518b9db5b
Merge "libutils: remove whitespaces in String16.cpp and String16.h"
...
am: 8c09555aac
2016-02-17 00:38:10 +00:00
Samuel Tan
8c09555aac
Merge "libutils: remove whitespaces in String16.cpp and String16.h"
2016-02-17 00:33:31 +00:00
Alex Deymo
eef3703475
Merge "Add .clang-format symlink to Brillo\'s clang-format."
...
am: 753676a154
2016-02-17 00:06:18 +00:00
James Hawkins
def841933f
Merge "bootstat: Add a few more bootreasons and rebase the index against index 1." into nyc-dev
2016-02-17 00:01:48 +00:00
Alex Deymo
753676a154
Merge "Add .clang-format symlink to Brillo's clang-format."
2016-02-16 23:38:29 +00:00
Samuel Tan
f9d16ef106
libutils: remove whitespaces in String16.cpp and String16.h
...
Remove trailing whitespaces in both these files.
BUG: None
Change-Id: I18eca5162871b5b2bf7757a7ef36a4e80073798c
2016-02-16 15:21:34 -08:00
Alex Deymo
5e087e451c
Add .clang-format symlink to Brillo's clang-format.
...
This patch replaces the locally defined clang-format with a symlink
to the one defined in build/tools.
Bug: 27121653
TEST=Ran clang-format.
Change-Id: I8810428d12b60c7463bc7f9a96228600ec8b425d
2016-02-16 14:39:56 -08:00
Sami Tolvanen
604b89fd18
Merge "logd: enforce policy integrity"
...
am: d1ac932330
2016-02-16 22:21:56 +00:00
Elliott Hughes
5ce57a6717
Merge "Move libnetutils headers into libnetutils."
...
am: d61ad3c44e
2016-02-16 22:11:31 +00:00
Sami Tolvanen
d1ac932330
Merge "logd: enforce policy integrity"
2016-02-16 21:52:13 +00:00
Elliott Hughes
09389827c6
Merge "Remove unnecessary #include from <memtrack/memtrack.h>."
...
am: 0a3a46afea
2016-02-16 21:51:43 +00:00
Elliott Hughes
d61ad3c44e
Merge "Move libnetutils headers into libnetutils."
2016-02-16 21:25:52 +00:00
Elliott Hughes
0a3a46afea
Merge "Remove unnecessary #include from <memtrack/memtrack.h>."
2016-02-16 21:24:18 +00:00
Sami Tolvanen
d122ee65b6
logd: enforce policy integrity
...
If a SELinux policy change or a switch to permissive mode is detected
on a user build, restart the device into safe mode, and keep it there
until an OTA is applied or user data is wiped.
This change deprecates the ro.logd.auditd property.
Needs matching changes from
I781c3059ea8d4fb2f0c923e4488b1932d69678d3
Ica825cf2af74f5624cf4091544bd24bb5482dbe7
Id3ca7889ede30b54b7af73dd50653ca1a20d59aa
Bug: 26902605
Change-Id: Idcdc5bff133f13c1267f0ec0a75cc8cf1ddbda0d
2016-02-16 12:54:54 -08:00
Mark Salyzyn
c50a99cbd4
Merge "liblog: document fakeLogClose never to be called"
...
am: 8cd629aedd
2016-02-16 20:46:08 +00:00
Elliott Hughes
3e08b8205c
Merge "Move libdiskconfig headers into libdiskconfig."
...
am: 737325fb7c
2016-02-16 20:46:00 +00:00
Elliott Hughes
dc52d09650
Merge "Don\'t go busy loop when waiting child process."
...
am: ae2b746c82
2016-02-16 20:45:52 +00:00
Elliott Hughes
008ed76b22
Merge "fs_mgr: BLKGETSIZE causes memory corruption"
...
am: 9c9818374e
2016-02-16 20:45:43 +00:00
Elliott Hughes
ffd662d259
Merge "Move libmemtrack headers into libmemtrack."
...
am: 1c3d784030
2016-02-16 20:45:35 +00:00
Mark Salyzyn
8cd629aedd
Merge "liblog: document fakeLogClose never to be called"
2016-02-16 20:22:15 +00:00
Mark Salyzyn
bc81b17e06
liblog: document fakeLogClose never to be called
...
Bug: 27107691
Change-Id: Ia699646ec2e83ca46f8b62b5d4f144e533b36074
2016-02-16 10:35:06 -08:00
Elliott Hughes
737325fb7c
Merge "Move libdiskconfig headers into libdiskconfig."
2016-02-16 18:34:24 +00:00
Elliott Hughes
e81f4d6d40
Remove unnecessary #include from <memtrack/memtrack.h>.
...
Change-Id: I933bc75ffa8a612fd6f572e6ee76cf9a24a35562
2016-02-16 10:32:30 -08:00
Elliott Hughes
ae2b746c82
Merge "Don't go busy loop when waiting child process."
2016-02-16 18:23:32 +00:00
Elliott Hughes
9c9818374e
Merge "fs_mgr: BLKGETSIZE causes memory corruption"
2016-02-16 18:16:42 +00:00
Tao Wu
bc31090b7a
Don't go busy loop when waiting child process.
...
Before this change, code works like this: after gets POLLHUP from poll, it just
go a busy loop to do poll -> waitpid -> poll -> waitpid ... until child process
really exit. This doesn't make sense and is waste of CPU.
Change-Id: If6cd8b0245587d623e309c3ae27f162e1c7ef504
Signed-off-by: Tao Wu <lepton@google.com>
2016-02-16 10:13:48 -08:00
Keith Mok
d93adf55df
fs_mgr: BLKGETSIZE causes memory corruption
...
BLKGETSIZE return unsigned long sector size,
but unsigned long is of 8 bytes in 64 bits system.
Passing an integar value will causes stack corruption.
Use BLKGETSIZE64 instead.
Change-Id: I60323e51c6692d4405cf2ed015ab4216c1591f68
2016-02-16 09:51:00 -08:00
Elliott Hughes
1c3d784030
Merge "Move libmemtrack headers into libmemtrack."
2016-02-16 17:14:11 +00:00
Lorenzo Colitti
ef6454d3d3
Tolerate RTM_DELADDR messages from deleted interfaces.
...
When an interface is deleted (which can happen, for example, to
the tun interfaces used for VPN and 464xlat), the kernel sends
RTM_DELADDR messages for all its IP addresses.
Currently we ignore these because we cannot fetch the interface
name. Instead, pass them up with an empty interface name so that
NetlinkHandler can do something useful for them, such as destroy
connections on the IP addresses that are being deleted.
Bug: 26976388
Change-Id: I2ced7e389228f9d665d0a87d97bd3452c8c0c98b
2016-02-16 23:12:26 +09:00
Jeff Sharkey
68ed65a1ea
Re-derive permissions after package changes. am: a44febd19b am: 36a6835aa5 am: 77a3c8fccd
...
am: 7916cc9e40
2016-02-14 22:58:46 +00:00
Jeff Sharkey
7916cc9e40
Re-derive permissions after package changes. am: a44febd19b am: 36a6835aa5
...
am: 77a3c8fccd
2016-02-14 22:50:44 +00:00
Jeff Sharkey
77a3c8fccd
Re-derive permissions after package changes. am: a44febd19b
...
am: 36a6835aa5
2016-02-14 22:39:02 +00:00
Jeff Sharkey
36a6835aa5
Re-derive permissions after package changes.
...
am: a44febd19b
2016-02-14 22:28:35 +00:00
James Hawkins
64040b2aee
Merge "bootstat: Add a few more bootreasons and rebase the index against index 1."
...
am: 06bfaa7078
2016-02-13 22:32:59 +00:00
James Hawkins
ee79e73373
bootstat: Add a few more bootreasons and rebase the index against index 1.
...
This is necessary to match the mapping in the internal infrastructure.
Bug: 21724738
Change-Id: I292166ff5c0dea7f3d771627120f16af4c56073b
(cherry picked from commit 6f74c0b843
2016-02-13 14:02:25 -08:00
James Hawkins
06bfaa7078
Merge "bootstat: Add a few more bootreasons and rebase the index against index 1."
2016-02-13 21:46:21 +00:00
Elliott Hughes
8dccdbf3f8
Move libdiskconfig headers into libdiskconfig.
...
Change-Id: I5d8e29687dca39a2a134d92f311528479b4ea102
2016-02-13 12:48:23 -08:00
James Hawkins
6f74c0b843
bootstat: Add a few more bootreasons and rebase the index against index 1.
...
This is necessary to match the mapping in the internal infrastructure.
Bug: 21724738
Change-Id: I292166ff5c0dea7f3d771627120f16af4c56073b
2016-02-13 09:54:35 -08:00
Dimitry Ivanov
d362cc5da9
Merge "Add missing liblog dependency"
...
am: 8b68829c06
2016-02-13 04:58:45 +00:00
Dimitry Ivanov
8b68829c06
Merge "Add missing liblog dependency"
2016-02-13 04:44:44 +00:00
Elliott Hughes
c768bfc9f5
Merge "Move libnativeloader headers into libnativeloader."
...
am: 25aca65a93
2016-02-13 03:49:33 +00:00
Elliott Hughes
25aca65a93
Merge "Move libnativeloader headers into libnativeloader."
2016-02-13 03:35:44 +00:00
Dimitry Ivanov
01f21da732
Add missing liblog dependency
...
Bug: http://b/27171986
Change-Id: Ia7f03c72de9a8e5d61896bde6b4b1af396376f54
2016-02-12 18:40:29 -08:00
