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

12883 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul Lawrence
6a5244bcc2 am 2b3a4939: Merge "Revert "Securely encrypt the master key"" 
* commit '2b3a4939463cb2eb6b65e416f6544a2e2d3bc29b':
  Revert "Securely encrypt the master key"
 2015-04-28 19:29:25 +00:00
Paul Lawrence
2306880f07 am 6e8c8f54: Merge "Revert "Only run vold command when file encryption enabled"" 
* commit '6e8c8f542d673f3402df6b70df64b29c759e526a':
  Revert "Only run vold command when file encryption enabled"
 2015-04-28 19:17:20 +00:00
Paul Lawrence
2b3a493946 Merge "Revert "Securely encrypt the master key"" 2015-04-28 19:15:40 +00:00
Paul Lawrence
7ac2807546 Revert "Securely encrypt the master key" 
This reverts commit 4bf1887c78.

Change-Id: Ie6d1f39de530b99b50a27ddc45bcc900a24e04b5
 2015-04-28 19:15:01 +00:00
Paul Lawrence
6e8c8f542d Merge "Revert "Only run vold command when file encryption enabled"" 2015-04-28 19:14:45 +00:00
Paul Lawrence
34276a1534 Revert "Only run vold command when file encryption enabled" 
This reverts commit efe190e023.

Change-Id: Ib15af9a85b0b885a388bda28511a6fc39a777264
 2015-04-28 19:12:35 +00:00
Elliott Hughes
d797763ca6 am 4b81659e: Merge "Remove strtok from adb." 
* commit '4b81659ed2c0dd71c123301238c35b1e825e5b7a':
  Remove strtok from adb.
 2015-04-28 18:08:50 +00:00
Elliott Hughes
4b81659ed2 Merge "Remove strtok from adb." 2015-04-28 17:54:36 +00:00
Paul Lawrence
2088427c8c am a71ef0d5: Merge "Only run vold command when file encryption enabled" 
* commit 'a71ef0d5b5c0e304d947f3782603890294d06ee2':
  Only run vold command when file encryption enabled
 2015-04-28 15:33:10 +00:00
Paul Lawrence
a71ef0d5b5 Merge "Only run vold command when file encryption enabled" 2015-04-28 15:24:10 +00:00
Elliott Hughes
8d5fa6da44 Remove strtok from adb. 
Also fix android::base::Split to behave like Java, Python, and google3.

Change-Id: Ifbffd4e92950a79e7aea5d153c95fe0980648417
 2015-04-27 19:42:20 -07:00
Elliott Hughes
3c93c69205 am 06d2128f: Merge "Support the full length of USB serial numbers." 
* commit '06d2128f8729f3349f5ba588829c6f992a793c22':
  Support the full length of USB serial numbers.
 2015-04-28 00:28:49 +00:00
Elliott Hughes
06d2128f87 Merge "Support the full length of USB serial numbers." 2015-04-28 00:18:29 +00:00
Elliott Hughes
9309ecbcec Support the full length of USB serial numbers. 
Two bugs: we couldn't report the serial number correctly if it was long
enough, and it wasn't possible to connect to a device whose serial number
was long enough to overflow a different fixed-length buffer.

Bug: http://b/20317730
Change-Id: Ic9cf3c847066449ac78069bd1718184935098ac7
 2015-04-27 14:52:17 -07:00
Paul Lawrence
72fad66f0a am 9234b169: Merge "Securely encrypt the master key" 
* commit '9234b169e62b10e38ecd3dc636ccccb425ea4eed':
  Securely encrypt the master key
 2015-04-27 20:25:16 +00:00
Paul Lawrence
9234b169e6 Merge "Securely encrypt the master key" 2015-04-27 20:08:53 +00:00
Elliott Hughes
55d3eb0afd am 96b6415c: Merge "Use WriteFully in debuggerd to talk to ActivityManager." 
* commit '96b6415c560fc59e7114fd6f455943765947eeb7':
  Use WriteFully in debuggerd to talk to ActivityManager.
 2015-04-27 20:00:45 +00:00
Elliott Hughes
96b6415c56 Merge "Use WriteFully in debuggerd to talk to ActivityManager." 2015-04-27 19:47:30 +00:00
Greg Hackmann
64c1ec114b am ba5f10a5: Merge "libziparchive: fix clang build" 
* commit 'ba5f10a565f0ba79bf72456852665e705de3b381':
  libziparchive: fix clang build
 2015-04-27 17:28:58 +00:00
Greg Hackmann
ba5f10a565 Merge "libziparchive: fix clang build" 2015-04-27 17:16:25 +00:00
Greg Hackmann
d6eac24aac libziparchive: fix clang build 
Change-Id: I69105a9cde05b182f65c7e574282bb4b48b66e95
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2015-04-27 10:14:32 -07:00
Narayan Kamath
3e20a73718 am 246f8533: Merge "Avoid mapping output to memory while writing to a file." 
* commit '246f8533bf397bb0d505c5cc53e8533c2d59d3fd':
  Avoid mapping output to memory while writing to a file.
 2015-04-27 15:44:05 +00:00
Narayan Kamath
246f8533bf Merge "Avoid mapping output to memory while writing to a file." 2015-04-27 15:16:38 +00:00
Narayan Kamath
f899bd534b Avoid mapping output to memory while writing to a file. 
It's unnecessary, and causes issues when the uncompressed
output is large.

Change-Id: I99cfb3933b094c2826c7e6c6de9aab03478fcc53
 2015-04-27 13:34:18 +01:00
Nick Kralevich
ecf184c901 am 9c9280d8: Merge "init: get rid of the remaining double mounts" 
* commit '9c9280d863d7377858af6e1543ea4ada7af3b0ec':
  init: get rid of the remaining double mounts
 2015-04-26 02:00:51 +00:00
Nick Kralevich
9c9280d863 Merge "init: get rid of the remaining double mounts" 2015-04-26 01:51:04 +00:00
Nick Kralevich
45a49d0eb7 am ccac2be8: Merge "init: use SELinux /dev/null if available" 
* commit 'ccac2be8a6269469087a7978e1a6db62ef4618c6':
  init: use SELinux /dev/null if available
 2015-04-26 01:30:43 +00:00
Nick Kralevich
f667a3247a init: get rid of the remaining double mounts 
Don't double mount /dev and its subdirectories anymore. Instead, the
first stage init is solely responsible for mounting it.

Don't have init prepare the property space. This is the responsibility
of the second stage init.

Don't have SELinux use the property space to determine how we should
be running. Instead, create a new function and extract the data we
need directly from /proc/cmdline. SELinux needs this information in
the first stage init process where the property service isn't available.

Change-Id: I5b4f3bec79463a7381a68f30bdda78b5cc122a96
 2015-04-25 18:29:26 -07:00
Nick Kralevich
ccac2be8a6 Merge "init: use SELinux /dev/null if available" 2015-04-26 00:59:01 +00:00
Nick Kralevich
e34577ce1b init: use SELinux /dev/null if available 
SELinux provides it's own /dev/null character device at
/sys/fs/selinux/null. This character device is exactly the same
as /dev/null, including the same major/minor numbers, and can
be used wherever /dev/null is used.

Use /sys/fs/selinux/null instead of trying to create our own
/dev/__null__ device. This moves us one step closer to eliminating
all uses of mknod() by init.

/sys/fs/selinux/null is only available once the /sys/fs/selinux filesystem
is mounted. It's not available to the first stage init, so we
still have to fall back to mknod then.

Change-Id: Ic733767ea6220a130537de33cc478ae79578ce20
 2015-04-25 16:48:23 -07:00
Nick Kralevich
b31c3a5a45 am 178299fd: Merge "init: don\'t double mount /proc and /sys" 
* commit '178299fd459b7622e9e3de05a48d6ba050f92bec':
  init: don't double mount /proc and /sys
 2015-04-25 23:16:49 +00:00
Nick Kralevich
6b6df17337 am f8b0743e: Merge "init: fix write_file checkreqprot logic error" 
* commit 'f8b0743ef418c15fe622143a6b4b42b102a07803':
  init: fix write_file checkreqprot logic error
 2015-04-25 23:16:48 +00:00
Elliott Hughes
ecd6e36d37 am 47a9ef2f: Merge "Improve logging of USBDEVFS_CLAIMINTERFACE failures." 
* commit '47a9ef2f116fd885a3ba0e9027a45b2a68cc5b3f':
  Improve logging of USBDEVFS_CLAIMINTERFACE failures.
 2015-04-25 23:16:46 +00:00
Nick Kralevich
178299fd45 Merge "init: don't double mount /proc and /sys" 2015-04-25 23:11:27 +00:00
Nick Kralevich
f8b0743ef4 Merge "init: fix write_file checkreqprot logic error" 2015-04-25 23:09:08 +00:00
Elliott Hughes
47a9ef2f11 Merge "Improve logging of USBDEVFS_CLAIMINTERFACE failures." 2015-04-25 23:05:28 +00:00
Nick Kralevich
9dec93bfeb init: don't double mount /proc and /sys 
The first stage init mounts /proc and /sys, and then the second
stage init also mounts /proc and /sys on top of the existing mount.
Only mount these two directories once, in the first stage init.

Not yet fixed: the double mounting of /dev. Removing the double
mounting doesn't work right now because both init stages are trying
to create a property space, and if the double mount of /dev goes away,
the property service in the second stage init fails to work.

Change-Id: I13719027a47526d074390c2b1a605ad99fb43a8f
 2015-04-25 15:50:03 -07:00
Nick Kralevich
eedbe81f75 init: fix write_file checkreqprot logic error 
write_file() returned -errno on error, not -1. Callers who check for
-1 would falsely believe that the write was successful when it wasn't.
Fixup write_file so that it return -1 on error consistent
with other functions.

Change-Id: Ic51aaf8678d8d97b2606bd171f11b3b11f642e39
 2015-04-25 15:36:13 -07:00
Elliott Hughes
ce6363bbbc Improve logging of USBDEVFS_CLAIMINTERFACE failures. 
Bug: https://code.google.com/p/android/issues/detail?id=170054
Change-Id: I9b11eb019093e3322da0a8e70d6e17de4c25ab75
 2015-04-25 14:44:23 -07:00
Nick Kralevich
ecfb3664fe am 8929c77a: Merge "init: remove mkdir /dev /proc /sys" 
* commit '8929c77ab9aa9be612291809669e9162837c54ae':
  init: remove mkdir /dev /proc /sys
 2015-04-25 21:19:17 +00:00
Nick Kralevich
8929c77ab9 Merge "init: remove mkdir /dev /proc /sys" 2015-04-25 21:08:12 +00:00
Nick Kralevich
a1f6a4b139 init: remove mkdir /dev /proc /sys 
These directories are already present in the initial ramdisk, and
these mkdir calls are no-ops.

Change-Id: I528f9e96a3471de904845a2f9e09c1b6ff83a708
 2015-04-25 13:48:26 -07:00
Elliott Hughes
cd58f488c2 am 6ce5625d: Merge "Improve toolbox SIGPIPE behavior." 
* commit '6ce5625d58c2376b719802a0ae0b56bcd3afcdc8':
  Improve toolbox SIGPIPE behavior.
 2015-04-25 19:26:23 +00:00
Elliott Hughes
6ce5625d58 Merge "Improve toolbox SIGPIPE behavior." 2015-04-25 19:14:54 +00:00
Elliott Hughes
5976018b4a Improve toolbox SIGPIPE behavior. 
None of our tools -- except for top, which I'd fixed previously --
handles SIGPIE correctly. Let's just handle SIGPIPE in the driver.

Bug: https://code.google.com/p/android/issues/detail?id=157920
Change-Id: I322ea411f53c71585a64118c217d54389f675d4e
 2015-04-25 12:03:41 -07:00
Elliott Hughes
b7cd09b93e Use WriteFully in debuggerd to talk to ActivityManager. 
Change-Id: I5b57fda9b0343434e1c0f9189147075a368e0282
 2015-04-24 22:25:12 -07:00
Elliott Hughes
5281a2a8e9 am 9798023e: Merge "Add ReadFully and WriteFully to libbase." 
* commit '9798023e9f646a51222b5fd4683c91bfbfc5167f':
  Add ReadFully and WriteFully to libbase.
 2015-04-25 05:11:00 +00:00
Elliott Hughes
ae3154e396 am 2899c94b: Merge "Switch init to epoll." 
* commit '2899c94b9d962c308ef71ee10809c61ac39e0ce5':
  Switch init to epoll.
 2015-04-25 05:10:59 +00:00
Elliott Hughes
9798023e9f Merge "Add ReadFully and WriteFully to libbase." 2015-04-25 05:01:21 +00:00
Elliott Hughes
2899c94b9d Merge "Switch init to epoll." 2015-04-25 05:01:03 +00:00