Commit graph

517 commits

Author SHA1 Message Date
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
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
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
Jaewan Kim
373d9fa082 Support static IP config on Ethernet
Bug: 7606609
Bug: 8687763
Change-Id: I1d76b5783e8511a8e3f5d981e6b4b9fb4fbecdf4
2014-05-22 00:00:35 +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
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
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
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
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