Commit Graph

16185 Commits

Author SHA1 Message Date
Daniel Rosenberg b381f0a5e1 am 71ca82bf: am 8da23664: Merge "rootdir: Create cache folder in Android.mk"
* commit '71ca82bf954c4bd5b8817eeabb78418fafde90ce':
  rootdir: Create cache folder in Android.mk
2015-07-20 19:58:51 +00:00
Daniel Rosenberg 71ca82bf95 am 8da23664: Merge "rootdir: Create cache folder in Android.mk"
* commit '8da23664e78dc5b5a483385fb55328d0d7639867':
  rootdir: Create cache folder in Android.mk
2015-07-20 19:37:17 +00:00
Daniel Rosenberg 8da23664e7 Merge "rootdir: Create cache folder in Android.mk" 2015-07-20 19:21:49 +00:00
Elliott Hughes 6d416684b5 am 9287d2d8: am 953b44c3: Merge "Fix adbd/adb server confusion in an error message."
* commit '9287d2d83a420d750e3c1490d52930c11f662a19':
  Fix adbd/adb server confusion in an error message.
2015-07-20 18:18:54 +00:00
Elliott Hughes 9287d2d83a am 953b44c3: Merge "Fix adbd/adb server confusion in an error message."
* commit '953b44c3ed7b543f5e0c3799f1d37114028be3d2':
  Fix adbd/adb server confusion in an error message.
2015-07-20 17:42:52 +00:00
Elliott Hughes 953b44c3ed Merge "Fix adbd/adb server confusion in an error message." 2015-07-20 17:25:16 +00:00
Daniel Erat 777b9bdd39 am 3a8a3241: am 4812f8dd: Merge "Add a "dbus" AID for running dbus-daemon."
* commit '3a8a32413615643320bb140a24ab1d77d9aea804':
  Add a "dbus" AID for running dbus-daemon.
2015-07-20 15:26:52 +00:00
Daniel Erat 3a8a324136 am 4812f8dd: Merge "Add a "dbus" AID for running dbus-daemon."
* commit '4812f8dd306e6cbd7f0b2330fae05a66ba1e6bc6':
  Add a "dbus" AID for running dbus-daemon.
2015-07-20 15:12:42 +00:00
Daniel Erat 4812f8dd30 Merge "Add a "dbus" AID for running dbus-daemon." 2015-07-20 15:03:52 +00:00
Elliott Hughes 64d303a0e7 Fix adbd/adb server confusion in an error message.
Change-Id: Iacb8bcfb1e8e1d46198ee4ba8cf0ec0d1b98c75a
2015-07-18 13:57:46 -07:00
Elliott Hughes 4f8edb3c27 am 099ec31b: am ff201659: Merge "Fix the Mac libcutils build."
* commit '099ec31bdb910020c5c86b4ad8711940616bcbaf':
  Fix the Mac libcutils build.
2015-07-18 18:21:16 +00:00
Elliott Hughes 099ec31bdb am ff201659: Merge "Fix the Mac libcutils build."
* commit 'ff2016599ddaab326ff94c9f1680ac641bb0055e':
  Fix the Mac libcutils build.
2015-07-18 18:09:03 +00:00
Elliott Hughes 69b2c2a125 am 6657d224: am 069f62de: Merge "Fix N9 boot."
* commit '6657d2248e902289476c4b937f5d6a1585c95ec2':
  Fix N9 boot.
2015-07-18 18:02:01 +00:00
Elliott Hughes ff2016599d Merge "Fix the Mac libcutils build." 2015-07-18 17:53:39 +00:00
Elliott Hughes 6657d2248e am 069f62de: Merge "Fix N9 boot."
* commit '069f62de20f83226801e9a43c372ba34d3c3c12f':
  Fix N9 boot.
2015-07-18 17:48:00 +00:00
Elliott Hughes 0f8f70beb4 Fix the Mac libcutils build.
The stupid Mac doesn't have SOCK_NONBLOCK.

Bug: http://b/22559299
Change-Id: I476dadd0ba0076f5e61a4cd9b1f39cf3508f4188
2015-07-18 10:47:59 -07:00
Elliott Hughes 069f62de20 Merge "Fix N9 boot." 2015-07-18 17:39:24 +00:00
Elliott Hughes 04b2022f7e Fix N9 boot.
Without this, sdcard fails to start because its mount point doesn't
exist.

Bug: http://b/22568628
Change-Id: Ic6a2f51fc74c5bd1f23d97592049495ac3822bb3
2015-07-18 10:34:53 -07:00
Elliott Hughes 790d25b76a am 5403d155: am e36b10a8: Merge "Switch libcutils from gethostbyname to getaddrinfo."
* commit '5403d155a3677ff334246eb5524ced4166fd1c96':
  Switch libcutils from gethostbyname to getaddrinfo.
2015-07-18 17:21:05 +00:00
Elliott Hughes 5403d155a3 am e36b10a8: Merge "Switch libcutils from gethostbyname to getaddrinfo."
* commit 'e36b10a8179a6d55d374655f28b682633e19b009':
  Switch libcutils from gethostbyname to getaddrinfo.
2015-07-18 17:06:47 +00:00
Elliott Hughes e36b10a817 Merge "Switch libcutils from gethostbyname to getaddrinfo." 2015-07-18 16:55:58 +00:00
Elliott Hughes 94ae41874a Switch libcutils from gethostbyname to getaddrinfo.
Needed for IPv6 support.

Bug: http://b/22559299
Change-Id: Id10d958b434b207e84bc2ec2ff83221f2c4e8168
2015-07-17 23:45:15 -07:00
Daniel Erat f7b8cae2ef Add a "dbus" AID for running dbus-daemon.
Bug: 22328216
Change-Id: I8478f57d892c6edeb6b101cfa8b38dc5c6262cb2
2015-07-17 16:04:54 -06:00
Alex Vallée 947cb3e8ee Remove subproc events when ADB_HOST.
The code which triggers these events (via the SHELL_EXIT_NOTIFY_FD) are
only called from code which is already guarded by #if !ADB_HOST.

Change-Id: I184414f5e090c1f08ee117e4c8c434cd4a8b5221
2015-07-17 16:00:29 -04:00
Jeff Sharkey 9ca1ddb6ec am 5271b5ed: am ed2fe57c: Use single tree for multiple storage views.
* commit '5271b5edeb8613c74d7d7df91c1fd2ac0dbabf5b':
  Use single tree for multiple storage views.
2015-07-17 00:33:19 +00:00
Jeff Sharkey 5271b5edeb am ed2fe57c: Use single tree for multiple storage views.
* commit 'ed2fe57c2509d0d784ba7dbce1deef21afb2a612':
  Use single tree for multiple storage views.
2015-07-16 23:50:08 +00:00
Jeff Sharkey ed2fe57c25 Use single tree for multiple storage views.
Instead of having each view build and maintain its own tree
representing the underlying storage, switch to building a single tree
that each view augments with GID/mode specific behavior.

This has the nice property of a single file always having the same
node ID when presented across multiple views, giving us a firm handle
that we can use to invalidate kernel caches.

Specifically, when a file is deleted through one view, we now tell
the kernel to invalidate that file in the other two views.

Bug: 22477678, 22375891
Change-Id: I3ff041d549d41040839cde9773504719a508219f
2015-07-16 15:30:45 -07:00
Elliott Hughes 1d8f0cd667 am 770b78bd: am 683790ae: Merge "init: Fix bootchart trigger for emulator"
* commit '770b78bd2384493f5b9b5c7a04b2fc10bdeed003':
  init: Fix bootchart trigger for emulator
2015-07-16 21:39:48 +00:00
Elliott Hughes 0c27d276d1 am c06c3001: am a1c344b9: Merge "Move mkdirs to adb_utils."
* commit 'c06c3001156cbbdf8d6b3e187e0f92c51c5a80b3':
  Move mkdirs to adb_utils.
2015-07-16 21:39:47 +00:00
Elliott Hughes 770b78bd23 am 683790ae: Merge "init: Fix bootchart trigger for emulator"
* commit '683790ae54cd0202385027d259f78894639911e7':
  init: Fix bootchart trigger for emulator
2015-07-16 21:23:30 +00:00
Elliott Hughes c06c300115 am a1c344b9: Merge "Move mkdirs to adb_utils."
* commit 'a1c344b9de508dda83f60f9dea6559e7b6ea6c28':
  Move mkdirs to adb_utils.
2015-07-16 21:23:29 +00:00
Elliott Hughes 683790ae54 Merge "init: Fix bootchart trigger for emulator" 2015-07-16 21:11:23 +00:00
Elliott Hughes a1c344b9de Merge "Move mkdirs to adb_utils." 2015-07-16 21:09:56 +00:00
Nick Kralevich a498153c9b am d9bb7852: am c66e37b2: Merge "init: refuse to start process if domain transition not defined"
* commit 'd9bb7852441c3d9509c0a5e99821c69c55e62b58':
  init: refuse to start process if domain transition not defined
2015-07-16 19:49:57 +00:00
Nick Kralevich d9bb785244 am c66e37b2: Merge "init: refuse to start process if domain transition not defined"
* commit 'c66e37b2da62f536d698b0265321fb02929f7ea5':
  init: refuse to start process if domain transition not defined
2015-07-16 19:35:50 +00:00
Nick Kralevich c66e37b2da Merge "init: refuse to start process if domain transition not defined" 2015-07-16 19:20:31 +00:00
Nick Kralevich 4800dbf1da init: refuse to start process if domain transition not defined
When SELinux is in enforcing mode, any process executed by
init must have a domain transition defined. See
https://android-review.googlesource.com/108640 for details. This
prevents an executable spawned by init from remaining in init's
(very powerful) SELinux domain.

However, this is only enforced when SELinux is in enforcing mode.
During new device bringup, it's common to run an Android device
in globally permissive mode. In globally permissive mode, SELinux
denials are logged only, but otherwise ignored. If appropriate
SELinux domain transitions are not defined from init to init spawned
processes, this could cause misleading SELinux denials attributed
to init instead of the child process.

To help address these misleading denials, modify init to not spawn
processes unless a domain transition is defined. This essentially
enforces the rules in https://android-review.googlesource.com/108640
on both permissive and enforcing kernels.

While I'm here, change some "freecon()" calls to "free()", with the
long term goal of deleting freecon() entirely.

Change-Id: I3ef3a372bb85df61a3f6234cb1113cc25fc6506a
2015-07-16 11:32:19 -07:00
Sami Tolvanen 191fd279a5 am 83d8701b: Update partition.*.verified even with ro.boot.veritymode set
* commit '83d8701b0610882009bbdccad6ae8542e0d9eeee':
  Update partition.*.verified even with ro.boot.veritymode set
2015-07-15 20:47:42 +00:00
Alex Vallée 1421614821 Move mkdirs to adb_utils.
There were duplicate implementations in commandline.cpp and
file_sync_client.cpp.

Change-Id: Ib448f76c0d7ffdcd577336b1c610a881425bc2db
2015-07-15 19:37:18 +00:00
Sami Tolvanen 83d8701b06 Update partition.*.verified even with ro.boot.veritymode set
We need to have partition.*.verified properties even when bootloader
is managing dm-verity mode, because we may have failed to set up the
verified partition and need a property to indicate this.

This means we still need to run fs_mgr_update_verity_state and walk
through all the partitions to verify the device mapper status, just
without updating verity mode.

Bug: 22489805
Bug: 22507568
Change-Id: Iaf28185adb8b80e5452447e54e1f4e4417a34168
(cherry picked from commit 2f42554f18)
2015-07-15 19:13:43 +00:00
Sami Tolvanen aaa14ebcfb am 6c3b205c: am 759717ee: Merge "Update partition.*.verified even with ro.boot.veritymode set"
* commit '6c3b205c408f92101ddfa053cb134371e951a9a7':
  Update partition.*.verified even with ro.boot.veritymode set
2015-07-15 19:02:28 +00:00
Sami Tolvanen 6c3b205c40 am 759717ee: Merge "Update partition.*.verified even with ro.boot.veritymode set"
* commit '759717ee63f7d8a75089bc4adc308d190ec6b0ac':
  Update partition.*.verified even with ro.boot.veritymode set
2015-07-15 18:48:02 +00:00
Sami Tolvanen 759717ee63 Merge "Update partition.*.verified even with ro.boot.veritymode set" 2015-07-15 18:35:51 +00:00
Yusuke Sato 0df08271fb Use fsck.f2fs -a instead of -f for faster boot
and run fsck with -f on clean shutdown instead.

With -f, fsck.f2fs always performs a full scan of the /data
partition regardless of whether the partition is clean or not.
The full scan takes more than 2 seconds on volantis-userdebug
and delays the OS boot.

With -a, the command does almost nothing when the partition
is clean and finishes within 20-30ms on volantis-userdebug.
When the partition has an error or its check point has
CP_FSCK_FLAG (aka "need_fsck"), the command does exactly the
same full scan as -f to fix it.

Bug: 21853106
Change-Id: I126263caf34c0f5bb8f5e6794454d4e72526ce38
2015-07-15 10:13:51 -07:00
Sami Tolvanen 2f42554f18 Update partition.*.verified even with ro.boot.veritymode set
We need to have partition.*.verified properties even when bootloader
is managing dm-verity mode, because we may have failed to set up the
verified partition and need a property to indicate this.

This means we still need to run fs_mgr_update_verity_state and walk
through all the partitions to verify the device mapper status, just
without updating verity mode.

Bug: 22489805
Change-Id: Iaf28185adb8b80e5452447e54e1f4e4417a34168
2015-07-15 09:11:13 +00:00
Yu Ning 9136f38aab init: Fix bootchart trigger for emulator
When launched with "-bootchart <timeout>", the Android emulator appends
"androidboot.bootchart=<timeout>" to the kernel command line, which
signals /init to start bootcharting. However, the current implementation
of bootchart_init() in init/bootchart.cpp does not parse the timeout
value correctly, preventing bootcharting to be enabled on the emulator.

This bug was introduced by commit 841b263 ("Further refactoring of the
bootchart code"). Fix it to honor the "androidboot.bootchart" trigger.

Change-Id: I221fe2c2f40a3a04bd478c3a083f7723bc309c8c
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-07-15 16:41:51 +08:00
Daniel Rosenberg 86b151cbe8 rootdir: Create cache folder in Android.mk
system.img may contain the root directory as well. In that case, we
need to create some folders init.rc would during the build.

Change-Id: I312104ff926fb08d98ac8256b76d01b0a90ea5e5
2015-07-14 17:18:52 -07:00
Yin-Chia Yeh 9491fc4cce am a2d1f098: am 0fdee393: Merge "graphics: update flexible YUV format gralloc requirement" into mnc-dev
* commit 'a2d1f098dfc9d1a6e52229457bab8ca5a47bda55':
  graphics: update flexible YUV format gralloc requirement
2015-07-14 20:41:38 +00:00
Daniel Rosenberg 1c45c0ff5d Merge "resolved conflicts for merge of 074ee014 to mnc-dr-dev-plus-aosp" into mnc-dr-dev-plus-aosp 2015-07-14 20:21:52 +00:00
Daniel Rosenberg cfda5bb47a resolved conflicts for merge of 074ee014 to mnc-dr-dev-plus-aosp
Change-Id: I346583851035950350433136599f73ab2bedba4b
2015-07-14 13:12:48 -07:00