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
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
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
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
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
dcashman
11673a03e0
am 8b4ea5a4: am 39a5b812: am 2baf2886: Merge "Enable world-readable selinuxfs policy binary."
...
* commit '8b4ea5a49dda2767af87604713053e1bc418e96f':
Enable world-readable selinuxfs policy binary.
2014-04-09 16:41:17 +00:00
dcashman
8b4ea5a49d
am 39a5b812: am 2baf2886: Merge "Enable world-readable selinuxfs policy binary."
...
* commit '39a5b812904ec13390d6261bafccf823729ae21d':
Enable world-readable selinuxfs policy binary.
2014-04-09 16:37:05 +00:00
dcashman
5822a4af84
Enable world-readable selinuxfs policy binary.
...
Change-Id: I1eefb457cea1164a8aa9eeb7683b3d99ee56ca99
2014-04-07 14:05:43 -07:00
Narayan Kamath
dc9af896f0
resolved conflicts for merge of 6a949b45
to master
...
Change-Id: Ie123b4fff76ef43e2b1c0583731e88997504320e
2014-04-01 17:40:45 +01:00
Narayan Kamath
6a949b45e9
am ffca173c: am 5da2dbbc: Merge "Move zygote init config to its own file."
...
* commit 'ffca173c853a2e312610d87f40957f696ac8364a':
Move zygote init config to its own file.
2014-04-01 16:29:57 +00:00
Narayan Kamath
5da2dbbc93
Merge "Move zygote init config to its own file."
2014-04-01 16:22:02 +00:00
Greg Hackmann
788b272268
am ae66fbbe: am 697bdc60: am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"
...
* commit 'ae66fbbe0e747cb2485bac0fa47c9223268a2fc9':
rootdir: reduce permissions on /dev/rtc0
2014-03-31 20:30:26 +00:00
Greg Hackmann
ae66fbbe0e
am 697bdc60: am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"
...
* commit '697bdc604e8f266ebd6c94fc84eb5057b1a700e3':
rootdir: reduce permissions on /dev/rtc0
2014-03-31 20:24:39 +00:00
Greg Hackmann
a740b3bb40
Merge "rootdir: reduce permissions on /dev/rtc0"
2014-03-31 20:13:52 +00:00
Narayan Kamath
4456a55ce6
Move zygote init config to its own file.
...
This allows us to choose different configs depending on
whether or not the target is 64 capable, and what its preferred
default is.
bug: 13647418
Change-Id: Ie1ce4245a3add7544c87d27c635ee390f4062523
2014-03-31 12:31:11 +01:00
Greg Hackmann
b34fed34af
rootdir: reduce permissions on /dev/rtc0
...
Remove world-readable, reduce group permissions to readable by system
daemons
Change-Id: I6c7d7d78b8d8281960659bb8490a01cf7fde28b4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-27 15:52:01 -07:00
Paul Lawrence
5c789b8a31
Merge "Auto-encrypt drive at startup"
2014-03-24 22:18:58 +00:00
Paul Lawrence
166fa3de70
Auto-encrypt drive at startup
...
Modify fs_mgr to unmount encryptable drives after test mounting them and
then trigger an auto-encrypt via the init script
Needs matching vold changes from
https://googleplex-android-review.googlesource.com/#/c/414200/
Feature is limited to list of serial numbers with this change
Bug: 11985952
Change-Id: I84f85a258b6a7e9809467c9149249302e203c41b
2014-03-24 15:00:53 -07:00