Commit graph

12373 commits

Author SHA1 Message Date
Mark Salyzyn
db5334ad03 run-as: bracket capability
- do not assume that caller has granted effective bits in capabilities
- only elevate capabilities when needed
- suppress capabilities before exec when called as shell,shell,shell
- some Android coding standard cleanup

Bug: 19908228
Change-Id: Ibe3d1c1a0fdcb54c41d7a72395e50ad749df98ce
2015-03-31 09:44:48 -07:00
Tao Bao
cd153076dc Merge "adb: Add option to reboot into sideload mode in recovery" 2015-03-31 00:57:33 +00:00
Elliott Hughes
a58c0b5f12 Merge "Build init with clang." 2015-03-31 00:35:20 +00:00
Tao Bao
175b7bbfb4 adb: Add option to reboot into sideload mode in recovery
Currently it requires manual key press to enter the sideload mode. This
CL adds 'adb reboot sideload' to reboot the device into sideload mode
directly with text display on. With 'adb reboot sideload-auto-reboot',
it will reboot after the sideload regardless of the installation result,
unless interrupted by user.

Since it needs to write to /cache/recovery/command file, 'adb root' is
required before calling 'adb reboot sideload' and the one with
'-auto-reboot'.

Also it requires the matching CL in bootable/recovery.

Change-Id: Ib7bd4e216a1efc01e64460659c97c6005bbaec1b
2015-03-31 00:19:52 +00:00
Elliott Hughes
9efd95b029 Build init with clang.
Change-Id: I14d95b3fe0505dd7d7632e2eedc537f97553c715
2015-03-30 14:37:11 -07:00
Elliott Hughes
ffa85da612 Merge "Lose route to toybox." 2015-03-30 20:57:56 +00:00
Elliott Hughes
eb809351db Merge "Always unlink /dev/__kmsg__." 2015-03-30 19:12:47 +00:00
Elliott Hughes
798ec0c39d Lose route to toybox.
Change-Id: If68fa6a691478921452ebd785bd35e3ba5a8470a
2015-03-30 11:23:44 -07:00
Dan Albert
6d457fe1a8 Merge "Enable building libbase on Windows." 2015-03-30 17:47:03 +00:00
Dan Albert
b2326bd56c Enable building libbase on Windows.
We have to exclude the logging facilities for now (since we don't have
a std::mutex on Windows), but there's plenty else in here that is
worth having.

Change-Id: I6d1369e34e08ea2e88a0b1130c4462e5d35d99e2
2015-03-30 10:30:42 -07:00
Elliott Hughes
c2d9cc8576 Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)" 2015-03-30 17:18:51 +00:00
Johan Redestig
c06541912d toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)
ioctl(BLKGETSIZE) expects unsigned long
(8 bytes on 64 bit environment).

Change-Id: Ic0f1d48e1d4cb890dbf617b3eb6285425cdbf0d0
2015-03-30 10:17:29 -07:00
Elliott Hughes
934102baf8 Merge "Lose load_policy to toybox." 2015-03-28 20:35:05 +00:00
Elliott Hughes
f29940559a Lose load_policy to toybox.
Change-Id: I3ef3aab9eef8e07ee598e2559a316e2fccf7199b
2015-03-28 13:29:05 -07:00
Elliott Hughes
48402951cf Merge "Clarify a few things about bootcharts." 2015-03-28 20:22:01 +00:00
Elliott Hughes
59abac27cb Clarify a few things about bootcharts.
Make it clearer in dmesg when we're deliberately not doing
bootcharting, and explain in the documentation that the output
for init is quite misleading (and, as far as I can tell, not
within our power to fix).

Change-Id: I0b22a56f83521d64c6d176dc423c81f7ea86b23c
2015-03-28 12:12:51 -07:00
Dan Albert
8f03e3cb3d Merge "Revert "Remove the emulator special case from the "adb root" code."" 2015-03-28 19:04:40 +00:00
Dan Albert
868402e5bf Revert "Remove the emulator special case from the "adb root" code."
adb root doesn't work on the emulator, so this prevents root access
to a userdebug emulator.

Since the emulator has always been root even on userdebug builds, it
may be that adb root has never worked on the emulator.

Bug: 19974213

This reverts commit abd6773b41.
2015-03-28 19:04:15 +00:00
Elliott Hughes
6a62cac4c1 Merge "Further cleanup of the logic in device_init." 2015-03-28 18:45:45 +00:00
Elliott Hughes
56a0656ed9 Further cleanup of the logic in device_init.
Change-Id: I96e4b11894926b50792b9b7d7cfa0fe8392abef6
2015-03-28 11:26:15 -07:00
Elliott Hughes
6dbbcc57a0 Merge "Fix clang build by removing unused locals." 2015-03-28 17:57:46 +00:00
Elliott Hughes
747383649c Fix clang build by removing unused locals.
Also don't manually set FD_CLOEXEC on a socket that's always opened
with SOCK_CLOEXEC. (None of the other callers to the function do this.)

Also move locals to where they're first used to help prevent more of this
kind of breakage.

Change-Id: I1ba7cd9400f53508dffb51a2bbf9d491ae647f26
2015-03-28 10:51:23 -07:00
Elliott Hughes
c02f81cccb Always unlink /dev/__kmsg__.
Whether the open succeeds or fails, we should unlink.

Change-Id: Ic2f1e10dc7b6d6e459c56049da00d165bd63ba8f
2015-03-28 09:51:54 -07:00
Elliott Hughes
5db3936dbe Merge "Log more timing information from init." 2015-03-28 16:46:06 +00:00
Elliott Hughes
da40c00137 Log more timing information from init.
Also make important events in init's life NOTICE rather than INFO,
and ensure that NOTICE events actually make it to the kernel log.

Also fix the logging so that if you have a printf format string
error, the compiler now catches it.

Also give messages from init, ueventd, and watchdogd distinct tags.
(Previously they'd all call themselves "init", and dmesg doesn't
include pids, so you couldn't untangle them.)

Also include the tag in SELinux messages.

Bug: 19544788
Change-Id: Ica6daea065bfdb80155c52c0b06f346a7df208fe
2015-03-28 00:25:22 -07:00
Dan Albert
e29744d94d Merge "Remove uses of libcxx.mk." 2015-03-27 18:33:41 +00:00
Dan Albert
d0a793dca3 Remove uses of libcxx.mk.
This is a no-op.

Change-Id: Iecbcd5f6d818abbf98767a2e996c10f454b652e4
2015-03-27 11:24:04 -07:00
Dan Albert
42f1192273 Merge "Pull in Windows compatibility header." 2015-03-27 06:35:54 +00:00
Dan Albert
5188d556d1 Merge "Include what we use." 2015-03-27 06:35:14 +00:00
Dan Albert
94d1360f7e Pull in Windows compatibility header.
Needed for O_CLOEXEC, O_NOFOLLOW, and DEFFILEMODE.

Change-Id: Id6c0465a6559c30ac8c085c28be0d47c9738f02a
2015-03-26 23:33:28 -07:00
Dan Albert
6ccfabcf5d Merge "O_CLOEXEC is O_NOINHERIT on Windows." 2015-03-27 06:29:40 +00:00
Dan Albert
c6b30f376d O_CLOEXEC is O_NOINHERIT on Windows.
Change-Id: I714aa08344fa10684c99651f953834086cc162c7
2015-03-26 23:24:15 -07:00
Dan Albert
4b3f533be9 Include what we use.
Change-Id: If510431d3d445de94f781b4fdec2e1b445f7c294
2015-03-26 23:23:43 -07:00
Dan Albert
87378814a0 Merge "adb shell: Win32: fix Ctrl-C, tab completion, line editing, server echo" 2015-03-27 05:28:38 +00:00
Andreas Gampe
6e014d774d Merge "Libbacktrace: Use frame-pointer on host" 2015-03-27 00:43:15 +00:00
Andreas Gampe
dce8f2923d Libbacktrace: Use frame-pointer on host
Otherwise it may have problems unwinding over itself.

Change-Id: I9b0d108018ae3f5d98b9ae6fb62d0af83a77d18e
2015-03-26 16:21:13 -07:00
Nick Kralevich
de52ebc3f9 Merge "libaudit: limit to 5 selinux denials per sec" 2015-03-26 21:33:02 +00:00
Nick Kralevich
a15db51bbf libaudit: limit to 5 selinux denials per sec
watchdog is triggering on shamu. This may be due to an excessive
number of SELinux denials. Drop the limit from 20/sec to 5/sec.

Bug: 19950451
Bug: 19949988
Change-Id: I979f11e17c241ff2ebda4dec9694ef441dc5d0ed
2015-03-26 14:04:13 -07:00
Spencer Low
50184062b8 adb shell: Win32: fix Ctrl-C, tab completion, line editing, server echo
The 'adb shell' command on Windows has had problems:

* Ctrl-C killed the local Windows adb.exe process instead of sending the
Ctrl-C to the Android device.

* Local echo was enabled, causing everything typed to be displayed twice.

* Line input was enabled, so the Android device only received input
after hitting enter. This meant that tab completion did not work because
the tab wasn't seen by the shell until pressing enter.

* The usual input line editing keys did not work (Ctrl-A to go to the
beginning of the line, etc.).

This commit fixes these issues by reconfiguring the Win32 console and
then translating input into what Gnome Terminal would send, in effect
somewhat emulating a Unix terminal.

This does not fix all Win32 console issues, but is designed to be better
than what we had before, and to make the common day-to-day usage much
more comfortable and usable.

Change-Id: Idb10e0b634e27002804fa99c09a64e7176cf7c09
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-03-26 12:26:08 -07:00
Sami Tolvanen
6baab44eed Merge "Fix build" 2015-03-26 11:56:53 +00:00
Sami Tolvanen
4d3ead9d7c Fix build
Fix build breakage in aosp_fugu-userdebug_clang (linux) caused
by Id8711f7d51dc1e4e9a4d84f9951240f64528e69d

Change-Id: Icd04aeaf131be045cf5788846ae9832e6cbbb944
2015-03-26 11:44:42 +00:00
Sami Tolvanen
d33c6c0ef2 Merge "Use structured format for verity metadata" 2015-03-26 07:38:15 +00:00
Elliott Hughes
cfead6dacf Merge "$ANDROID_BUILD_TOP isn't set for continuous builds." 2015-03-26 04:19:53 +00:00
Elliott Hughes
608fb70dd8 $ANDROID_BUILD_TOP isn't set for continuous builds.
Instead, take advantage of the fact that we'll be run from the root of the
tree.

Change-Id: I5ce6d1c9ae8d478748ab90c9d3cc8e665ae5859b
2015-03-25 21:18:43 -07:00
Elliott Hughes
09b66b93f1 Merge "Auto-generate the getevent labels from <linux/input.h>." 2015-03-26 03:38:19 +00:00
Elliott Hughes
c7f3c5c10c Auto-generate the getevent labels from <linux/input.h>.
Now we only have to remember to update the kernel uapi headers, which
we're pretty good at.

Change-Id: If04eb8c50882fff5e5e2a5d72664f5d4c4c538b1
2015-03-25 17:34:22 -07:00
Richard Uhler
a0115bf78d Merge "Add make target for shared libcutils on host." 2015-03-25 15:48:42 +00:00
Richard Uhler
acb31ba905 Add make target for shared libcutils on host.
Needed by host dex2oat.

Change-Id: Ia5b53136de3d531c820f03c3f251e58418204be1
2015-03-24 14:46:01 -07:00
Mark Salyzyn
8257211f9e Merge "init: missing break statement" 2015-03-24 16:44:05 +00:00
Mark Salyzyn
7a3d66c9eb init: missing break statement
Change-Id: Iac4a19c404590c3faba6021c7e537b01805c2d45
2015-03-24 07:29:22 -07:00