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
Yabin Cui
01a805d2c2
am 2cd0563c: am d3119b19: Merge "Add ip6-localhost to /system/etc/hosts."
...
* commit '2cd0563c53c8aa566c924d389ff34d7c46ea43b7':
Add ip6-localhost to /system/etc/hosts.
2015-01-14 22:18:38 +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
Yabin Cui
2cd0563c53
am d3119b19: Merge "Add ip6-localhost to /system/etc/hosts."
...
* commit 'd3119b1962ef5c0d15b9cc22beb9ded040b44dcb':
Add ip6-localhost to /system/etc/hosts.
2015-01-13 23:39:26 +00:00
Yabin Cui
25147416bb
Add ip6-localhost to /system/etc/hosts.
...
Bug: 18791191
Change-Id: Id7cad8cfccadeb319f0dc7dcba8148a457f9f87d
2015-01-13 14:38:21 -08: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
Elliott Hughes
053ae64820
am a0959e90: am 8eb770d3: Merge "Remove long-dead readtty."
...
* commit 'a0959e90f550f06969c2e21a0858b8d4cb8d4228':
Remove long-dead readtty.
2014-11-25 19:57:00 +00:00
Elliott Hughes
a0959e90f5
am 8eb770d3: Merge "Remove long-dead readtty."
...
* commit '8eb770d37cd9470630fdbe496f22b7a04549fef7':
Remove long-dead readtty.
2014-11-25 19:03:12 +00:00
Elliott Hughes
b120134bd1
Remove long-dead readtty.
...
Change-Id: I15ae14542214a3802d43892da0d03cfb33e63c96
2014-11-24 12:01:21 -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
Arve Hjønnevåg
e272a538dc
am 06850f9c: am b50d0cd5: Merge "rootdir: Make trusty version readable by dumpstate" into lmp-mr1-dev
...
* commit '06850f9ccd9c7668a8ab80bdfea00c1b275b5af9':
rootdir: Make trusty version readable by dumpstate
2014-10-20 22:09:27 +00:00
Arve Hjønnevåg
b50d0cd53f
Merge "rootdir: Make trusty version readable by dumpstate" into lmp-mr1-dev
2014-10-20 21:53:59 +00:00
Arve Hjønnevåg
7770252a84
rootdir: Make trusty version readable by dumpstate
...
Change-Id: I761650d286b454f1fe01a585e7cd6ec769bfc527
2014-10-16 16:11:37 -07:00
Dmitriy Ivanov
976e1b6431
Remove libsigchain from LD_PRELOADs
...
Bug: 15345057
Bug: 15426766
(cherry picked from commit c9f9f35efa
)
Change-Id: If54e1aeaa1e2abe061ac19666af4f4e058b81df2
2014-10-16 11:45:16 -07:00
Dmitriy Ivanov
484c55a534
am b307dcd8: resolved conflicts for merge of 3f95c89d
to lmp-mr1-dev-plus-aosp
...
* commit 'b307dcd8715ea4ffa456d819e8e8812719d5e760':
Remove libsigchain from LD_PRELOADs
2014-10-14 19:05:21 +00:00
Dmitriy Ivanov
b307dcd871
resolved conflicts for merge of 3f95c89d
to lmp-mr1-dev-plus-aosp
...
Change-Id: Iac27dc93675c3111129fc594eaaff7f1d6f5c26f
2014-10-14 11:05:28 -07:00
Dmitriy Ivanov
1e2bec489c
resolved conflicts for merge of 3f95c89d
to lmp-dev-plus-aosp
...
Change-Id: I5184dcfa91a11a210c60e60a4fffc26d2c9f116f
2014-10-14 10:50:59 -07: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
Dmitriy Ivanov
c9f9f35efa
Remove libsigchain from LD_PRELOADs
...
Bug: 15345057
Bug: 15426766
Change-Id: If0b7f59a59824e30aa0c33dad76c7a44932180de
2014-10-07 13:39:02 -07: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
7569b7b39f
Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev
2014-10-06 18:40:46 +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
Jesse Hall
ca8079fd05
am 9ef98912: am 5a9d721b: am 10b13131: am c263e671: Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev
...
* commit '9ef989128059ce840178b8f19cde1183d32d9cee':
init.trace.rc: fix race condition with class_start core
2014-10-02 21:35:37 +00:00
Fred Fettinger
331a939bf8
init.trace.rc: fix race condition with class_start core
...
The systrace permissions from init.trace.rc and the "class_start core"
which launches surfaceflinger are both in an "on boot" section. However,
the init.trace.rc commands are parsed after all commands in init.rc.
This means that "class_start core" is executed before the chmod command
which allows processes to write to trace_marker. If any services
execute their first trace command before the chmod occurs, then that
service won't be able to write traces until the service is restarted.
To fix this, run all of the init.trace.rc commands in the "early-boot"
section to ensure they are completed first.
Bug: 17612265
Change-Id: Ibf544762173d5ba98272c66ef485d8eab7d70bf3
2014-10-01 12:29:29 -07:00
Badhri Jagan Sridharan
da0500426f
am 37441496: am 97b536f1: init.usb.rc: Change product id to for add only config
...
* commit '374414967a294db75c2706e691ba8b9af9aa1acb':
init.usb.rc: Change product id to for add only config
2014-09-05 23:04:27 +00:00
Badhri Jagan Sridharan
97b536f1fb
init.usb.rc: Change product id to for add only config
...
Change product id from D002 to 4EE7 when adb is the
only supported function
Change-Id: I8f6bcb9a1dc5ea6da0493a2dd730f9ac1f0bed24
2014-09-05 12:33:46 -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
Andres Morales
314313a991
Move bootanim and surfaceflinger to class core
...
They have no dependencies on /data so can be started early.
This permits us to unmount /data while bootanimation is running,
allowing an uninterrupted first boot encryption sequence.
Bug: 17260550
Change-Id: I323fe23e8cf488d8bc136387efdd9fcea96625eb
2014-08-26 20:09:10 +00:00
Paul Lawrence
ad5b54aa64
am a95e10fe: am a005e779: Merge "Enable not rebooting during default encryption" into lmp-dev
...
* commit 'a95e10fe3187d1dd3fbbd01d6653d7d9c2f9fc4d':
Enable not rebooting during default encryption
2014-08-26 10:07:27 +00:00
Paul Lawrence
a005e7795e
Merge "Enable not rebooting during default encryption" into lmp-dev
2014-08-25 20:28:36 +00:00
Paul Lawrence
c23074f386
Enable not rebooting during default encryption
...
Need to not set this property) during mount, since it can't
be changed later (ro property)
Also no reason to start class main on encryption cycle - we'll
show surfaceflinger, which is enough UI for this short cycle.
Bug: 17041092
Change-Id: Ica5339c54e45716d0fe20e23c0ab857f388d23ed
2014-08-25 19:24:10 +00:00
Robert Greenwalt
82b76249fb
Remove obsolete tcp buffer size system properties.
...
Change-Id: If6fb6fdcf8975e6102e84594ee3f64a5be6166f6
2014-08-17 15:17:00 -07:00
Michael Wright
4fe327b902
Merge "Remove inputflinger from init. DO NOT MERGE" into lmp-dev
2014-08-16 03:51:48 +00:00
Michael Wright
1de92cffc7
Remove inputflinger from init. DO NOT MERGE
...
Change-Id: I6ae2815a0c3f6b9c69e712af3ed6ce9d455ef3d3
2014-08-19 13:02:47 -07:00
Narayan Kamath
1fabc35cb5
Export the new system_server classpath.
...
bug: 16555230
Change-Id: I99d2d219b5bd6dc4807cb53e44dc5715cc0815b3
2014-08-07 15:32:07 +01:00
Riley Andrews
67cb1aeaa5
Remove the /dev/.booting file before triggering boot.
...
On mako only, there is a race condition such that
core + main services must be started after releasing
ueventd (by removing /dev/.booting).
bug 16304711
bug 16333352
2014-07-22 00:23:30 -07:00
Riley Andrews
d721f5fc21
Remove the /dev/.booting file before triggering boot.
...
On mako only, there is a race condition such that
core + main services must be started after releasing
ueventd (by removing /dev/.booting).
bug 16304711
bug 16333352
2014-07-16 03:59:53 +00:00
Riley Andrews
80c7a5e8a8
Move unlink("/dev/.booting") until after filesystems are mounted.
...
Move the unlink out of init.c and into init.rc, so that the file
will be removed after all the filesystems with firmware are up.
Change-Id: Ifdd5dd1e95d7e064dde5c80b70198882d949a710
2014-07-14 13:17:43 -07:00
Riley Andrews
9464e5a58d
Move unlink("/dev/.booting") until after filesystems are mounted.
...
Move the unlink out of init.c and into init.rc, so that the file
will be removed after all the filesystems with firmware are up.
Change-Id: I7442df2042cc2788d0301f00e3c2fba7d6e0e1c7
2014-07-11 15:47:15 -07:00
Nick Kralevich
ee0388e768
am f89ddf76: am d05245a4: am c87237f5: Merge "restorecon_recursive /cache"
...
* commit 'f89ddf76f9e3c10af9002cdb0d9b8eadcd59bf15':
restorecon_recursive /cache
2014-07-09 20:03:29 +00:00
Nick Kralevich
f89ddf76f9
am d05245a4: am c87237f5: Merge "restorecon_recursive /cache"
...
* commit 'd05245a4b10044670ed8456c5c869490fd90583f':
restorecon_recursive /cache
2014-07-09 20:01:02 +00:00
Sreeram Ramachandran
b12e40da25
am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."
...
* commit '0a7b44d55b9e9d038de390457246ec7fd0999cad':
Create a data directory for netd and other network-related files.
2014-07-08 19:14:36 +00:00
Nick Kralevich
e1695914d5
restorecon_recursive /cache
...
Make sure all files / directories within /cache are properly
labeled, not just the directory itself.
Addresses the following denial:
type=1400 audit(0.0:26): avc: denied { getattr } for comm="Thread-85" path="/cache/lost+found" dev="mmcblk0p27" ino=11 scontext=u:r:untrusted_app:s0 tcontext=u:object_r:unlabeled:s0 tclass=dir
Change-Id: I5937b30043efeb696ffaa77258b7294d20d1494e
2014-07-09 12:40:13 -07:00
dcashman
cddb15b8a9
am b4e74db7: am 3fa71b8e: Merge "Remove sshd."
...
* commit 'b4e74db79c9fda5e63ae49f299df3c0dd80a87f9':
Remove sshd.
2014-07-08 15:13:30 +00:00
dcashman
b4cbff47ad
Remove sshd.
...
This may require changes to other code, such as fastbootd, which relies on this
service. sshd is not currently, used, however, so this change will force any
such code to be changed.
Bug: 11594902
Change-Id: I07e52008290dab5825be2ad062cbe730fa7dff71
2014-07-07 23:42:15 +00:00
Sreeram Ramachandran
b46efdb08e
Create a data directory for netd and other network-related files.
...
Allows the 'shell' group (which is what dumpstate uses) to read the files in
this directory.
Change-Id: I69deb1a64d5d6647470823405bf0cc55b24b22de
2014-07-08 08:44:47 -07:00
Nick Kralevich
14253c1aab
Merge "init.rc: add seclabel to flash_recovery"
2014-07-07 17:47:39 +00:00
Nick Kralevich
a1d97e5d1c
init.rc: add seclabel to flash_recovery
...
Make sure flash_recovery is always running in the
install_recovery SELinux domain.
Change-Id: I9495eedd03f6b5dfcf2e78c03d1102f6032b327a
2014-07-08 12:41:16 -07:00
Sreeram Ramachandran
85449d360f
am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."
...
* commit 'b12e40da2526881c1730a3d3387556e4600c7040':
Create a data directory for netd and other network-related files.
2014-07-08 19:18:45 +00:00
dcashman
9f3a11edde
am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."
...
* commit 'cddb15b8a9057e7efacf2de9c9a6a887fd666663':
Remove sshd.
2014-07-08 15:19:50 +00:00
Riley Andrews
24912dc446
resolved conflicts for merge of fa6f2543
to master
...
Change-Id: I04ce82e5d245e90e2cc62b76d688ec902c1a471d
2014-06-26 20:49:46 -07:00
Riley Andrews
fa6f25432b
am 23340d8a: am 10f8cd1d: Merge changes Ia15b2110,I5498c725
...
* commit '23340d8adac7bf68a6e47064ab7b48c1e227a077':
Add ability to adjust init log level at runtime.
Improve init's debug printing.
2014-06-27 03:42:33 +00:00
Daniel Rosenberg
f67d6bd3c0
Moved symlink back up.
...
Moving the vendor symlink down was causing issues with some devices.
Moved it back up, and adjusted mount to remove symlinks if necessary.
Change-Id: I77126d77cfbef32250012bea3960c99b55db4cbb
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-06-26 22:07:37 +00:00
Riley Andrews
1bbef88e80
Add ability to adjust init log level at runtime.
...
+ Add a new property, sys.init_log_level, which can be set after init
bootstrap. This will control the level at which init does prints to klog.
Change-Id: Ia15b2110157b5e6b713785ece9b0fb94889be6c8
2014-06-26 15:05:20 -07:00
Daniel Rosenberg
f530c93c4a
Added support for vendor partition and image
...
Modified fastboot to flash vendor.img as well. Moved symlink
for /vendor to occur after mounting partitions. Changed mount
to also create the mount point.
Change-Id: I78e1ba24e6bb8b4af96a67ee0569af579439e682
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-06-24 21:51:31 +00:00
Riley Andrews
6bd4588d65
resolved conflicts for merge of 079c637f
to master
...
Change-Id: Iab9a857026de954d7497d6b0eaf3751d2d3904c7
2014-06-23 15:20:51 -07:00
Riley Andrews
079c637f3d
am 5b45e08a: am 7950fc47: Merge "Add ability to boot from charger mode."
...
* commit '5b45e08aabd6dcbab527d221584fe348c73c70d4':
Add ability to boot from charger mode.
2014-06-23 21:40:54 +00:00
Riley Andrews
e4b7b294f3
Add ability to boot from charger mode.
...
Add the ability to boot up directly from charger mode, instead of forcing
charger mode to initiate a full restart to launch 'full' android. This
should shave a few seconds off of boot time on supported devices (just
manta for now).
Change-Id: Ieec4494d929e92806e039f834d78b9002afd15c4
2014-06-20 16:43:00 -07:00
Riley Andrews
aab0d57d18
am 94fa2005: am 4f5392cb: Merge "Make indentation sane in init.rc"
...
* commit '94fa20058fbd0e4f7e3c6d1381cdb9718dd90cde':
Make indentation sane in init.rc
2014-06-20 01:35:47 +00:00
Riley Andrews
6dfdc7cd0c
Make indentation sane in init.rc
...
Change-Id: Ic632fbe1423eeef7ec958877d74db7b87fc385c6
2014-06-19 17:13:30 -07:00
Riley Andrews
53f24c2f94
am aab0d57d: am 94fa2005: am 4f5392cb: Merge "Make indentation sane in init.rc"
...
* commit 'aab0d57d18b202d059fec57c832d6443faff6ee3':
Make indentation sane in init.rc
2014-06-20 01:39:27 +00:00
Ying Wang
fd9cfb4c22
am 68d97430: am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."
...
* commit '68d97430dd2cc25bb753df748d859415520a7dcb':
Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
2014-06-18 23:03:48 +00:00
Ying Wang
2359b3c162
Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
...
(cherry picked from commit 7011a85606
)
Change-Id: I025fe1f64c87fd406b3a3bf3d20fd3b78be8a940
2014-06-18 15:43:29 -07:00
Ying Wang
7011a85606
Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
...
Change-Id: I4686c1239aa5ed361c918ce4e7a5abf9a1552ab4
2014-06-14 09:11:58 -07:00
Nick Kralevich
8ffe8eac5b
am f8cb68e1: am 3bff77a8: am 875dc8f3: Merge "Create /data/dalvik-cache/profiles"
...
* commit 'f8cb68e15ba242200e3525fffa2f969960e18a50':
Create /data/dalvik-cache/profiles
2014-06-12 23:17:38 +00:00
Nick Kralevich
f8cb68e15b
am 3bff77a8: am 875dc8f3: Merge "Create /data/dalvik-cache/profiles"
...
* commit '3bff77a8f90e673dbf41d97b7b842a3e4a6986bf':
Create /data/dalvik-cache/profiles
2014-06-12 23:12:45 +00:00
Nick Kralevich
511998fcdb
am 44aadc4d: am 1eebf538: am 59d16c9e: Merge "make console shell run as GID=shell"
...
* commit '44aadc4daf926155bf06bcf9d8f2daa96f861cdf':
make console shell run as GID=shell
2014-06-12 19:46:43 +00:00
Nick Kralevich
44aadc4daf
am 1eebf538: am 59d16c9e: Merge "make console shell run as GID=shell"
...
* commit '1eebf538d3e5465bbec84d86017bb9ca250a052b':
make console shell run as GID=shell
2014-06-12 19:43:07 +00:00
Nick Kralevich
f2cb352412
make console shell run as GID=shell
...
Change-Id: I240bec07b04de1b26eef14e4f590af56c1aaa276
2014-06-12 12:33:21 -07:00
Nick Kralevich
875dc8f3f3
Merge "Create /data/dalvik-cache/profiles"
2014-06-10 21:55:12 +00:00
Nick Kralevich
347ee511e4
Create /data/dalvik-cache/profiles
...
Make sure /data/dalvik-cache/profiles gets the correct
permissions and SELinux context, and ownership is properly
assigned to the system UID.
Change-Id: Ic1b44009faa30d704855e97631006c4b990a4ad3
2014-06-11 18:32:57 -07:00
Robin Lee
a54b7ca156
am b7c07da2: am 33154817: am 46fbaf06: Merge "Create world-searchable /data/misc/user directory"
...
* commit 'b7c07da2f4606ca36b93c2b9221e43e6ebe68831':
Create world-searchable /data/misc/user directory
2014-06-05 17:30:13 +00:00
Robin Lee
b7c07da2f4
am 33154817: am 46fbaf06: Merge "Create world-searchable /data/misc/user directory"
...
* commit '33154817e274a4c7c381e2f5ef73ead7093e3985':
Create world-searchable /data/misc/user directory
2014-06-05 17:26:31 +00:00
Robin Lee
46fbaf062f
Merge "Create world-searchable /data/misc/user directory"
2014-06-05 17:07:43 +00:00
Dave Allison
664bdde0f1
am 01546ff2: am dec41a38: am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"
...
* commit '01546ff208cec5ac15f81cc84f507fb8c9a51d98':
Add LD_PRELOAD for libsigchain.so to the environment
2014-05-29 21:10:00 +00:00
Dave Allison
01546ff208
am dec41a38: am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"
...
* commit 'dec41a388d58ae515c83df4ec084c1e38edb427a':
Add LD_PRELOAD for libsigchain.so to the environment
2014-05-29 21:06:24 +00:00
Dave Allison
dec41a388d
am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"
...
* commit '967729b7ca675d6f2c895a1bd56216a62b217e50':
Add LD_PRELOAD for libsigchain.so to the environment
2014-05-29 19:57:50 +00:00
Dave Allison
967729b7ca
Merge "Add LD_PRELOAD for libsigchain.so to the environment"
2014-05-29 19:51:42 +00:00
Nick Kralevich
e7fd4078a2
am 7206eccb: am c4ffa5f6: am c290bed0: Merge "Remove dmesg_restrict"
...
* commit '7206eccbd904508a199c7ec302d7395b3b674968':
Remove dmesg_restrict
2014-05-28 18:02:27 +00:00
Torne (Richard Coles)
f9ff246dd7
am 4f3ad823: am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
...
* commit '4f3ad823eaf97fcbcbb1afac67371aff76677b1d':
Add UID and directory for RELRO sharing support.
2014-05-28 18:02:24 +00:00
Nick Kralevich
7206eccbd9
am c4ffa5f6: am c290bed0: Merge "Remove dmesg_restrict"
...
* commit 'c4ffa5f62ef256ff286122d0ceea61364aa67e13':
Remove dmesg_restrict
2014-05-28 13:14:54 +00:00
Nick Kralevich
c4ffa5f62e
am c290bed0: Merge "Remove dmesg_restrict"
...
* commit 'c290bed0350cded5620ed8dbb68b1cfb07d9828c':
Remove dmesg_restrict
2014-05-28 13:11:38 +00:00
Nick Kralevich
c290bed035
Merge "Remove dmesg_restrict"
2014-05-28 13:09:34 +00:00
Torne (Richard Coles)
4f3ad823ea
am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
...
* commit 'a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9':
Add UID and directory for RELRO sharing support.
2014-05-28 10:20:55 +00:00
Torne (Richard Coles)
a8329a36ca
am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
...
* commit '96109cf36c3dd44e9ecfe4b810e21e77eaf834dc':
Add UID and directory for RELRO sharing support.
2014-05-28 10:17:44 +00:00
Nick Kralevich
1a6184baf3
Remove dmesg_restrict
...
dmesg_restrict is too coarse of a control. In Android's case,
we want to allow the shell user to see dmesg output, but disallow
others from seeing it.
Rather than rely on dmesg_restrict, use SELinux to control access
to dmesg instead. See corresponding change in external/sepolicy .
Bug: 10020939
Change-Id: I9d4bbbd41cb02b707cdfee79f826a39c1ec2f177
2014-05-27 16:51:11 -07:00
Torne (Richard Coles)
234f696ea7
Add UID and directory for RELRO sharing support.
...
Define a UID to be used by the process responsible for creating shared
RELRO files for the WebView native library, and create a directory owned
by that UID to use to store the files.
Bug: 13005501
Change-Id: I5bbb1e1035405e5534b2681f554fe16f74e3da1a
2014-05-27 14:00:29 +01:00
Narayan Kamath
ef386b3fb0
am b5d6c188: am 9196f5f2: am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."
...
* commit 'b5d6c18859424d86339ce895a42084a9c08552fd':
Add a zygote 64/32 bit config.
2014-05-27 11:13:44 +00:00
Narayan Kamath
b5d6c18859
am 9196f5f2: am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."
...
* commit '9196f5f2df7890100e8968983680e196e944bd05':
Add a zygote 64/32 bit config.
2014-05-27 11:10:11 +00:00
Narayan Kamath
9196f5f2df
am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."
...
* commit '5fe6fcc35d10c88dd55213dc5b2303ea73c1883b':
Add a zygote 64/32 bit config.
2014-05-27 11:04:38 +00:00
Jaewan Kim
373d9fa082
Support static IP config on Ethernet
...
Bug: 7606609
Bug: 8687763
Change-Id: I1d76b5783e8511a8e3f5d981e6b4b9fb4fbecdf4
2014-05-22 00:00:35 +00:00
Narayan Kamath
7cdbbcabda
Add a zygote 64/32 bit config.
...
64 bit zygote is the "primary" and the system server is run
as a 64 bit process.
Change-Id: Ie1c2b0809faa92937bc407dd66e7a606ebb4f8f3
2014-05-21 11:20:42 +01:00
Dave Allison
50b6a4b1b7
Add LD_PRELOAD for libsigchain.so to the environment
...
To remove the need to modify the bionic dynamic linker, add the
signal chaining library as a preload in the environment. This
will be picked up by the dynamic linker and will override
sigaction and sigprocmask to allow for signal chaining.
Change-Id: I6e2d0628b009bd01e0ed9aed0b311871b9c8363a
2014-05-15 20:35:11 -07:00
Narayan Kamath
8c56cebd44
am 08a15076: am a5f7aca8: am 75a8eeb1: Merge "Change app_process reference to app_process32."
...
* commit '08a1507603d63f07cfce65ead701330e1fe89894':
Change app_process reference to app_process32.
2014-05-15 10:34:38 +00:00
Narayan Kamath
08a1507603
am a5f7aca8: am 75a8eeb1: Merge "Change app_process reference to app_process32."
...
* commit 'a5f7aca82e63942e9449804fd11eb11aec710419':
Change app_process reference to app_process32.
2014-05-15 09:45:29 +00:00
Narayan Kamath
a5f7aca82e
am 75a8eeb1: Merge "Change app_process reference to app_process32."
...
* commit '75a8eeb1ecf9f748b1d53e5ff3a5e138a0cdbebd':
Change app_process reference to app_process32.
2014-05-15 09:41:36 +00:00
Narayan Kamath
75a8eeb1ec
Merge "Change app_process reference to app_process32."
2014-05-15 09:36:33 +00:00
Sreeram Ramachandran
066c9b5a00
am 9743f097: am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets."
...
* commit '9743f09724162186fb280627c3c125a55534a219':
Introduce fwmarkd: a service to set the fwmark of sockets.
2014-05-14 19:51:37 +00:00
Sreeram Ramachandran
9743f09724
am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets."
...
* commit '09eaad793a8cec9196255d740ecb89a1426c0bf7':
Introduce fwmarkd: a service to set the fwmark of sockets.
2014-05-14 19:48:10 +00:00
Sreeram Ramachandran
e38d470714
Introduce fwmarkd: a service to set the fwmark of sockets.
...
(cherry picked from commit d5121e212c1f53b1cb6458ee83be892d94fdfef3)
Change-Id: Ieb049fe34ea2b21a7f6108f2099d1a8b8f2c28f7
2014-05-14 11:12:42 -07:00
Narayan Kamath
b4932d592f
Change app_process reference to app_process32.
...
Required due to change 5a7ee9ad63 which makes
app_process a symlink to the primary zygote.
Change-Id: I940f6302db97f74dd57112e310014e989dc586e5
2014-05-14 16:41:18 +01:00
Sreeram Ramachandran
76202a2dfa
Introduce fwmarkd: a service to set the fwmark of sockets.
...
Change-Id: Ieb049fe34ea2b21a7f6108f2099d1a8b8f2c28f7
2014-05-14 04:12:12 -07:00
Sreeram Ramachandran
3c1c730f20
am ca61b484: am b8cfcf3d: am 32e4479d: Merge "Set kernel proc files for fwmark reflection and table numbers for RAs."
...
* commit 'ca61b484b6eb1bf92b05bc5386668ec51999e55a':
Set kernel proc files for fwmark reflection and table numbers for RAs.
2014-05-13 22:43:58 +00:00
Sreeram Ramachandran
ca61b484b6
am b8cfcf3d: am 32e4479d: Merge "Set kernel proc files for fwmark reflection and table numbers for RAs."
...
* commit 'b8cfcf3d9beb6ae09512941a182c326723b3ef41':
Set kernel proc files for fwmark reflection and table numbers for RAs.
2014-05-13 22:38:30 +00:00
Sreeram Ramachandran
b8cfcf3d9b
am 32e4479d: Merge "Set kernel proc files for fwmark reflection and table numbers for RAs."
...
* commit '32e4479d5535887d03625b43b7e3574b458dfc8d':
Set kernel proc files for fwmark reflection and table numbers for RAs.
2014-05-13 22:33:51 +00:00
Sreeram Ramachandran
fd94922329
Set kernel proc files for fwmark reflection and table numbers for RAs.
...
(cherry picked from commit 2c2807ac1041751583e0c3b6892ca56eae423fa2)
Change-Id: I5f0d759cb9b8590555af7f5503f00d3e455ece54
2014-05-13 13:02:44 -07:00
Ruchi Kandoi
f74cb95349
am 57569b3d: am 1abf4918: am c7580819: Merge "ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq"
...
* commit '57569b3d3cea0b2096a15e8d25b41df9f836fd08':
ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq
2014-05-01 17:53:03 +00:00
Ruchi Kandoi
57569b3d3c
am 1abf4918: am c7580819: Merge "ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq"
...
* commit '1abf49180acece56ff7573d53b65c6a28d2a4cb2':
ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq
2014-05-01 17:48:51 +00:00
Ruchi Kandoi
1abf49180a
am c7580819: Merge "ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq"
...
* commit 'c7580819934b85e93f58001f9b59b12712bb61b8':
ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq
2014-05-01 17:45:20 +00:00
Ruchi Kandoi
75b287b771
ueventd: Ueventd changes the permission of sysfs files for max/min
...
cpufreq
The owner and permissions for the sysfs file
/sys/devices/system/cpu*/cpufreq/scaling_max/min_freq is changed.
This would allow the PowerHAL to change the max/min cpufreq even after
the associated CPU's are hotplugged out and back in.
Change-Id: Ibe0b4aaf3db555ed48e89a7fcd0c5fd3a18cf233
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2014-05-01 17:30:41 +00:00
Bill Yi
1333e012ee
Merge commit '4102af05a86aae36d2560fd8b3f740a52399342c' into HEAD
2014-04-29 16:07:40 -07:00
Robin Lee
3094f82a8a
Create world-searchable /data/misc/user directory
...
installd will create a separate subdirectory for each user.
Change-Id: I95ec09169ea70f35443bbb3209237611e174ca29
2014-04-29 12:46:53 +01:00
Paul Lawrence
0aee64f614
Make Volantis devices encryptable
...
Volantis SurfaceFlinger holds open a file on data partition.
SurfaceFlinger is not running when we trigger_default_encryption
but if we start it before starting defaultcrypto it locks open
data, so we can't unmount it.
It will start anyway when main starts, so not starting it here
is safe - it will just cause a 1-2 second delay in the graphics
appearing.
Change-Id: Idd546a578e62a24f999367b1407b37ad0f00f3a2
2014-04-21 11:47:55 -07:00
JP Abgrall
e29590b08b
am 46e6b4f7: am b0397d55: am 9bb44b41: Merge "rootdir: init.rc: update max TCP window sizes for mobile networks"
...
* commit '46e6b4f7fd5f6488d0ba06a26d67888136b3ee3e':
rootdir: init.rc: update max TCP window sizes for mobile networks
2014-04-18 21:18:41 +00:00
JP Abgrall
46e6b4f7fd
am b0397d55: am 9bb44b41: Merge "rootdir: init.rc: update max TCP window sizes for mobile networks"
...
* commit 'b0397d55a2ff4b3c6664c9545be18ba88c07dea4':
rootdir: init.rc: update max TCP window sizes for mobile networks
2014-04-18 21:15:33 +00:00
Narayan Reddy
ce898489e4
rootdir: init.rc: update max TCP window sizes for mobile networks
...
GRPS: RTT=600ms, max tput=80kbps (class 12 GMSK 4+1)
EDGE: RTT=300ms, max tput=236kbps (class 12 8PSK)
UMTS: RTT=200ms, max tput=384kbps (R99)
HSDPA: RTT=75ms, max tput=14Mbps (cat 10)
HSUPA: RTT=50ms, max tput=14Mbps
HSPA: RTT=50ms, max tput=14Mbps
HSPA+: RTT=50ms, max tput=42Mbps (cat 20)
LTE: RTT=20ms, max tput=100Mbps (class 3)
bug 67569
Change-Id: I9d62359bbd11dc68e3649a7ea2295d0d4e25e3f2
Signed-off-by: Narayan Reddy <narayanr@nvidia.com>
Signed-off-by: Steve Lin <stlin@nvidia.com>
2014-04-18 19:19:44 +00:00
Paul Lawrence
391224c807
Merge "Fix forceencrypt"
2014-04-11 14:55:52 +00:00
Narayan Kamath
7bd273e04e
am d85efaa0: am a73f7e92: am 822b1a02: Merge "Add a config for dual mode zygote."
...
* commit 'd85efaa068708b19db3cc647ba62c0a2feb7da23':
Add a config for dual mode zygote.
2014-04-11 10:02:11 +00:00
Narayan Kamath
d85efaa068
am a73f7e92: am 822b1a02: Merge "Add a config for dual mode zygote."
...
* commit 'a73f7e924abb8e7b1aa3f0d64d0177ce7d1c58e6':
Add a config for dual mode zygote.
2014-04-11 09:57:24 +00:00
Narayan Kamath
822b1a024d
Merge "Add a config for dual mode zygote."
2014-04-11 08:22:38 +00:00
Paul Lawrence
f24aab7d74
Fix forceencrypt
...
When changing vdc cryptfs enablecrypto inplace default in
https://googleplex-android-review.git.corp.google.com/#/c/445001/
forgot to change init.rc
Change-Id: I2a937d3c302ab8eab4829a36101145d6fe726ab1
2014-04-10 13:31:46 -07:00
Narayan Kamath
468b37c106
Add a config for dual mode zygote.
...
Note that init.zygote64.rc, which supports a "pure"
64 bit zygote is around only for testing.
The life cycles of both zygotes are controlled by init,
and the assumption here is that they will be available
always. We start the system_server in 32 bit mode.
Note that the distinction between "primary" and "secondary"
simply defines the order in which ABI support is queried,
there's no real requirement that the primary zygote supports
the primary ABI of the device.
bug: 13647418
Change-Id: Id0be001ea6f934c3c2022d89a63aae9fae66cc38
2014-04-10 10:45:37 +01:00