Commit graph

589 commits

Author SHA1 Message Date
Paul Lawrence
6095afc115 Adding e4crypt support
Add file encryption flag to fstab.

If file encryption flag set in fstab, handle identically to block
encrypted volumes.

Requires matching change:
  https://googleplex-android-review.git.corp.google.com/#/c/642778/

Change-Id: I28c236959f2d7d5f0dccc8ea45c325ea0cf871fc
2015-03-23 14:16:43 -07:00
Daniel Cardenas
e3b164d024 Merge "Revert "lowmemorykiller: make perms 0220"" 2015-03-20 00:14:36 +00:00
Daniel Cardenas
429e7424f2 Revert "lowmemorykiller: make perms 0220"
This reverts commit b3739735b8.
Values are helpful to inspect during memory performance tuning.

b/19847626

Change-Id: I004ed37d5cc67e466c1fd1a84e47348524056e87
2015-03-20 00:10:15 +00:00
Mark Salyzyn
7ad506839a am 6025a2bc: am bd518bce: Merge changes I3187aa34,Iadac58e6
* commit '6025a2bc493534b3003ebd2ad7130366cf4f6723':
  init.rc: logd --reinit on changes to persistent properties
  logd: add reinit command
2015-03-13 07:09:39 +00:00
Mark Salyzyn
48d06069a8 init.rc: logd --reinit on changes to persistent properties
Bug: 19681572
Change-Id: I3187aa348dae79fa5822ffb7ee9566919a7a04e6
2015-03-12 12:24:53 -07:00
Mark Salyzyn
87946e714b am 20dc9c01: am 1dd71ae1: am f33c3bc9: Merge "init: drop dontpanic & apanic initialization"
* commit '20dc9c01fabb33ed5a0e17b8efbdcdbe576c0941':
  init: drop dontpanic & apanic initialization
2015-02-27 19:44:46 +00:00
Mark Salyzyn
1dd71ae12e am f33c3bc9: Merge "init: drop dontpanic & apanic initialization"
* commit 'f33c3bc9602e4a369c4cc5d28357b8f73a3eed6c':
  init: drop dontpanic & apanic initialization
2015-02-27 19:34:33 +00:00
Mark Salyzyn
1eaba37aae init: drop dontpanic & apanic initialization
Bug: 19050686
Bug: 19525200
Change-Id: Id81abe3b44283b439390b42db7a9da23748dee0a
2015-02-27 07:03:01 -08:00
Nick Kralevich
be95a75e6f am 0a316829: am 398ade81: am 7bb72b73: Merge "seclabel use on services out of system partition"
* commit '0a316829fb856f98d8db3ba78667feb19fb12e22':
  seclabel use on services out of system partition
2015-02-26 02:27:11 +00:00
Nick Kralevich
398ade817b am 7bb72b73: Merge "seclabel use on services out of system partition"
* commit '7bb72b73b0291636721d83a45adad175163361ec':
  seclabel use on services out of system partition
2015-02-26 01:07:12 +00:00
Narayan Kamath
2422c17c5e Track removal of the inputflinger binary.
Change-Id: Ie3c3e5a67e7dfac5bd1672da6979fb053e8483b9
2015-02-24 11:02:27 +00:00
William Roberts
6889007627 seclabel use on services out of system partition
These services can make use of type transitions already
present in the base policy.

Change-Id: Id785c39c4ea44598c64dc499bd943c73bc55ca85
2015-02-23 13:50:37 -08:00
Elliott Hughes
7630916fb8 am 9c1bc6bb: am 29576ae8: Merge "/vendor is sometimes on a separate partition now."
* commit '9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31':
  /vendor is sometimes on a separate partition now.
2015-02-14 05:14:22 +00:00
Elliott Hughes
9c1bc6bbc8 am 29576ae8: Merge "/vendor is sometimes on a separate partition now."
* commit '29576ae8901eb95d4c8a34f242a282b2fb73d35f':
  /vendor is sometimes on a separate partition now.
2015-02-14 05:08:42 +00:00
Elliott Hughes
3a5d71ac60 /vendor is sometimes on a separate partition now.
Change-Id: I3217c272ea38ab8212056e0432d0ededacd362f6
2015-02-13 16:59:00 -08:00
Elliott Hughes
e6cc8012f5 am 0903c13a: am 265df6f5: Merge "bootchart: fix bootchart can not be triggered problem"
* commit '0903c13ade29e6eedecd198ac54131248a1818f3':
  bootchart: fix bootchart can not be triggered problem
2015-02-12 21:36:21 +00:00
Elliott Hughes
0903c13ade am 265df6f5: Merge "bootchart: fix bootchart can not be triggered problem"
* commit '265df6f50c508710f0b717d67650732baa906976':
  bootchart: fix bootchart can not be triggered problem
2015-02-12 20:32:33 +00:00
Yongqin Liu
a197ff12dd bootchart: fix bootchart can not be triggered problem
bootchart uses a file on the data partition to decide if it should collect
data for bootchart, but the data partition will be mounted by the mount_all
command in the "on fs" section, and it will be only added into the action
queue when command "trigger fs" is executed, but that's after the
bootchart_init action (late_init).

This change makes bootchart_init a builtin command of init,
and make it executed as the first command of "on post-fs" section
which will be triggered after the "on fs" section.

This change also refactors the bootchart code to all be in bootchart.cpp.

Change-Id: Ia74aa34ca5b785f51fcffdd383075a549b2a99d9
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2015-02-12 12:13:24 -08:00
Paul Lawrence
d933fc0c05 am a1738915: am 317b4024: Revert "Make encryption configurable"
* commit 'a1738915329e704ea52fc09c222bb4893e6e51df':
  Revert "Make encryption configurable"
2015-02-09 04:14:22 +00:00
Paul Lawrence
a173891532 am 317b4024: Revert "Make encryption configurable"
* commit '317b4024a2a46b8c57abfa08f2a649df13572bd3':
  Revert "Make encryption configurable"
2015-02-07 00:11:12 +00:00
Paul Lawrence
317b4024a2 Revert "Make encryption configurable"
This reverts commit bda6272446.

The original fix seems to have led to boot failures in QA. Rather than
risk shipping, revert the change. Bug 18764230 reopened.

Requires change
    https://googleplex-android-review.git.corp.google.com/#/c/629764/

Bug: 19278390
Bug: 19199624

Change-Id: I8b6ab585666f2b0f585ffb2a5f61ac2e3462e06e
2015-02-06 17:32:09 +00:00
Greg Hackmann
0c713b5243 am 86cdce1a: am f52338fe: Merge "rootdir: enable armv8_deprecated swp hook"
* commit '86cdce1aab39ddbb346e6f7be1ca86531970419f':
  rootdir: enable armv8_deprecated swp hook
2015-02-05 23:31:32 +00:00
Greg Hackmann
86cdce1aab am f52338fe: Merge "rootdir: enable armv8_deprecated swp hook"
* commit 'f52338fe1e8f74123a895db591d6a2a53061a2b1':
  rootdir: enable armv8_deprecated swp hook
2015-02-05 23:21:19 +00:00
Greg Hackmann
cee8757f92 rootdir: enable armv8_deprecated swp hook
The upstream kernel now includes support for emulating legacy AArch32
instructions on ARMv8 devices.  By default this framework emulates
deprecated instructions but not obsolete instructions.

Android requires support for the obsolete SWP and SWPB instructions on
all ARM devices, so override this default for the swp emulation hook.

Change-Id: I82b9bdb564413ec7c1a101da75a9928aebe1606b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-02-05 13:38:58 -08:00
Nick Kralevich
07932da911 am e1f62802: am d07555db: Merge "ensure /data/tombstones exists on all Android devices"
* commit 'e1f62802f6bec8ecc89100a1bbbdc36b7d18985b':
  ensure /data/tombstones exists on all Android devices
2015-01-31 08:34:08 +00:00
Nick Kralevich
e1f62802f6 am d07555db: Merge "ensure /data/tombstones exists on all Android devices"
* commit 'd07555dba01d64011b0d611dd6d3b197b216c163':
  ensure /data/tombstones exists on all Android devices
2015-01-31 07:49:28 +00:00
Nick Kralevich
0359d778a5 ensure /data/tombstones exists on all Android devices
/data/tombstones is referenced by core platform code, but is not
guaranteed to exist on all Android devices. Move the directory
creation out of device specific files and into the core
init.rc file.

Bug: https://code.google.com/p/android/issues/detail?id=93207
Change-Id: I94ae5199a6a32c4fe555ca994fc4a8345e0c9690
2015-01-30 17:38:06 -08:00
Paul Lawrence
36d0eaecd7 Make encryption configurable
Delay mounting encryptable but unencrypted volumes until we can
check the ro.vold.forceencrypt flag, then optionally encrypt.

Requires matching vold change from
    https://googleplex-android-review.git.corp.google.com/#/c/615309/

Bug: 18764230
Change-Id: If22008be8de6a4f3216b349f81ace49be1730314
2015-01-28 11:41:53 -08:00
Paul Lawrence
e5a84ce55e am 7e890a4d: am bda62724: Make encryption configurable
* commit '7e890a4d32816d34b30fb5d1f651d966d64bbf36':
  Make encryption configurable
2015-01-26 16:28:33 +00:00
Paul Lawrence
7e890a4d32 am bda62724: Make encryption configurable
* commit 'bda6272446454886339841a62daaa1b66c07ad60':
  Make encryption configurable
2015-01-26 16:22:49 +00:00
Paul Lawrence
bda6272446 Make encryption configurable
Delay mounting encryptable but unencrypted volumes until we can
check the ro.vold.forceencrypt flag, then optionally encrypt.

Requires matching vold change from
    https://googleplex-android-review.git.corp.google.com/#/c/615309/

Bug: 18764230
Change-Id: If22008be8de6a4f3216b349f81ace49be1730314
2015-01-21 10:03:29 -08:00
Mark Salyzyn
f756cf1439 am 8c7380b4: am 3802b5d4: Merge "rootdir: add pstore"
* commit '8c7380b4761d5ca02d839ccd337014116134a5b8':
  rootdir: add pstore
2015-01-15 02:27:51 +00:00
Mark Salyzyn
8c7380b476 am 3802b5d4: Merge "rootdir: add pstore"
* commit '3802b5d4c5cb14864dcdd8820e9140b81a2d7d78':
  rootdir: add pstore
2015-01-14 17:46:46 +00:00
Mark Salyzyn
4b0313e4d3 rootdir: add pstore
/dev/pmsg0 used to record the Android log messages, then
on reboot /sys/fs/pstore/pmsg-ramoops-0 provides a means
to pull and triage user-space activities leading
up to a panic. A companion to the pstore console logs.

Change-Id: Id92cacb8a30339ae10b8bf9e5d46bb0bd4a284c4
2015-01-14 17:15:39 +00:00
Greg Hackmann
f3fd1226e0 init.rc: disable ICMP redirects
Bug: 18604139

Change-Id: I4bf22d0029f8b03b0ef4329b7b8632d8e116c8e1
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-12-10 09:38:14 -08:00
Nick Kralevich
ac12f25004 Ensure /data/adb exists
automerge: 6672300

* commit '667230074b6e4e306a50d84a88a57bf4f1ec0291':
  Ensure /data/adb exists
2014-11-05 19:18:32 +00:00
Nick Kralevich
667230074b Ensure /data/adb exists
Ensure that /data/adb always exists. This directory is used
for writing adb debugging information when persist.adb.trace_mask
is set.

Bug: https://code.google.com/p/android/issues/detail?id=72895

(cherry picked from commit 89252ce31a)

Change-Id: I44e01bee50125f4e6e5fff6e74c53bb2022ce355
2014-11-05 10:17:39 -08:00
Bill Yi
aad358fbc1 Merge commit 'b2042f7263c7bbacc5115de4a42c5a96b64a06f2' into HEAD 2014-10-22 08:49:05 -07:00
Nick Kralevich
268c887f0c am 147de7e1: am 37d70f53: am c0b4b8b0: Merge "Ensure /data/adb exists"
* commit '147de7e147c9a85158f79b6aeffd87af6b921690':
  Ensure /data/adb exists
2014-10-21 17:16:31 +00:00
Nick Kralevich
147de7e147 am 37d70f53: am c0b4b8b0: Merge "Ensure /data/adb exists"
* commit '37d70f53672c8878a5ce5506d6d89b851400f8e6':
  Ensure /data/adb exists
2014-10-21 17:10:47 +00:00
Nick Kralevich
89252ce31a Ensure /data/adb exists
Ensure that /data/adb always exists. This directory is used
for writing adb debugging information when persist.adb.trace_mask
is set.

Bug: https://code.google.com/p/android/issues/detail?id=72895
Change-Id: I9cee2a0202417ff72a5ede7742e25877f51732dd
2014-10-21 16:16:39 +00:00
Riley Andrews
49d1ba1743 am d1380d64: am 33b33549: Merge "Make the default cgroup, the foreground cgroup." into lmp-mr1-dev
* commit 'd1380d645de163d34a6e590f82eb0ee40d51f408':
  Make the default cgroup, the foreground cgroup.
2014-10-08 20:55:04 +00:00
Riley Andrews
522d72b702 Make the default cgroup, the foreground cgroup.
All kernel services will now be in the same cgroup as
foreground applications. This will now make kernel threads
not implicitly higher priority than android foreground
services.

Bug 17681097

Change-Id: I28e81c7aade50428d5395df86f00ce01c1e7af02
2014-10-07 19:24:54 +00:00
Mike Lockwood
157e3a4b22 am 6ee5d62a: am 67479c97: am 24e3e831: am 7569b7b3: Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev
* commit '6ee5d62ac00fa00d7b86072a7f19d58582a05d18':
  Add bootanimation to audio group so it can play boot sound
2014-10-06 19:48:28 +00:00
Mike Lockwood
7e58899bcf Add bootanimation to audio group so it can play boot sound
Bug: 17674304

Change-Id: I5d31bc024fa36fedac2c0ba5c4a8b100937183ad
2014-10-02 16:22:43 -07:00
Brian Carlstrom
074fc3ddfb am 68e0d185: am 24d2adba: am 188d4396: Merge "Change /dalvik-cache to be owned by root."
* commit '68e0d185f4640a8e1dc7b6d1aad17b51a802de37':
  Change /dalvik-cache to be owned by root.
2014-08-29 11:56:57 +00:00
Brian Carlstrom
68e0d185f4 am 24d2adba: am 188d4396: Merge "Change /dalvik-cache to be owned by root."
* commit '24d2adba7a2f9caa82a88be70ad2fe7397ab310a':
  Change /dalvik-cache to be owned by root.
2014-08-29 11:39:17 +00:00
Alex Light
c692410e16 Change /dalvik-cache to be owned by root.
Bug: 16875245

(cherry picked from commit 3878ebd724)

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-28 16:56:36 -07:00
Alex Light
3878ebd724 Change /dalvik-cache to be owned by root.
Bug: 16875245

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-27 15:42:19 -07:00
Andres Morales
22b27ad718 am c28be8be: am 314313a9: Move bootanim and surfaceflinger to class core
* commit 'c28be8be68a55a50f20b42101f0f33d558f8a548':
  Move bootanim and surfaceflinger to class core
2014-08-26 23:04:48 +00:00