Commit graph

889 commits

Author SHA1 Message Date
Tao Bao
abb1165236 Merge "Create /data/ota_package for OTA packages." into nyc-mr1-dev am: f9b7f7fdba
am: 27bbf8953d

* commit '27bbf8953d5a141912fe9325a4995da18ca86a6d':
  Create /data/ota_package for OTA packages.

Change-Id: I243ec91e45bf202a6867645504eb963b64262556
2016-06-07 04:45:48 +00:00
Tao Bao
27bbf8953d Merge "Create /data/ota_package for OTA packages." into nyc-mr1-dev
am: f9b7f7fdba

* commit 'f9b7f7fdba6f62309372fee7c619de1edd8aa389':
  Create /data/ota_package for OTA packages.

Change-Id: I8d0cb3b8687d376efbfbbf186f858bef1c7ccf8e
2016-06-07 04:43:14 +00:00
Tao Bao
380d6b1b4d Create /data/ota_package for OTA packages.
We will store OTA packages there for both A/B and non-A/B OTAs. The
directory will be accessed by GMSCore (for both), uncrypt (non-A/B),
update_engine (A/B), update_verifier (A/B) and possibly system server
(for non-A/B OTAs to clean up half-way uncrypt'd packages).

Bug: 28944800
Change-Id: I5aa8156ec5052bd15dfadd4d8c28925d464e4401
2016-06-03 13:11:29 -07:00
Jeffrey Vander Stoep
f97ae58686 Merge "add a property for controlling perf_event_paranoid" am: 9292d7dae3 am: a6d6f45037 am: 680b2f3cb6
am: 0e7344f1ca

* commit '0e7344f1cad902133480d5137af2bdae1bf255e4':
  add a property for controlling perf_event_paranoid

Change-Id: Ib4536fb05b7a3842f208e29bb6ace43ec87f1a39
2016-06-02 01:30:50 +00:00
Daniel Micay
fe01f56c0d add a property for controlling perf_event_paranoid
(Cherry picked from commit 2b22a66382)

This adds a system property for controlling unprivileged access to
perf_event_paranoid. It depends on adding kernel support for
perf_event_paranoid=3 based on grsecurity's PERF_HARDEN feature to
completely disable unprivileged access to perf. A minimal port of this
feature is used in the vanilla Debian kernel by default.

It hides the non-hardened value as an implementation detail, since while
it is currently 1, it will probably become 2 in the future.

Bug: 29054680

Change-Id: I6e3ae3cf18d8c76df94f879c34fb6fde519b89a9
2016-06-01 16:58:48 -07:00
Jeffrey Vander Stoep
680b2f3cb6 Merge "add a property for controlling perf_event_paranoid" am: 9292d7dae3
am: a6d6f45037

* commit 'a6d6f45037025175b3074661c9d2d80931d71817':
  add a property for controlling perf_event_paranoid

Change-Id: Ic1e1a1365735f73edde6767bf71da8c6e59b46a4
2016-06-01 23:33:12 +00:00
David Sehr
bc3ff3a7a2 add /data/misc/profman for output am: 0eb24e1bc7 am: cdc503c13b
am: 0be76bb96f

* commit '0be76bb96f718d802cfed09b41202fb07ba867af':
  add /data/misc/profman for output

Change-Id: Ic2c4c42e2cb59cfb609963a36b29325f7044041d
2016-06-01 14:13:40 +00:00
David Sehr
0be76bb96f add /data/misc/profman for output am: 0eb24e1bc7
am: cdc503c13b

* commit 'cdc503c13b153c8a9216725dcd0f03ee6414161e':
  add /data/misc/profman for output

Change-Id: I60764f97eacd6853f17baed62bb6beee67fbc6fa
2016-06-01 14:05:15 +00:00
David Sehr
b829f909f7 add /data/misc/profman for output
am: 0eb24e1bc7

* commit '0eb24e1bc7317eb5764567223cdd9405d16aefa7':
  add /data/misc/profman for output

Change-Id: Id672a7e5f4b64c9b3d707b4f45f1e7f8ce40ca34
2016-06-01 14:01:10 +00:00
David Sehr
0eb24e1bc7 add /data/misc/profman for output
Bug: 28748264
Change-Id: Ib57ccc570de446e03ea8c27ce8e404929138b213
2016-05-31 17:36:41 -07:00
Daniel Micay
2b22a66382 add a property for controlling perf_event_paranoid
This adds a system property for controlling unprivileged access to
perf_event_paranoid. It depends on adding kernel support for
perf_event_paranoid=3 based on grsecurity's PERF_HARDEN feature to
completely disable unprivileged access to perf. A minimal port of this
feature is used in the vanilla Debian kernel by default.

It hides the non-hardened value as an implementation detail, since while
it is currently 1, it will probably become 2 in the future.

Bug: 29054680

Change-Id: I6e3ae3cf18d8c76df94f879c34fb6fde519b89a9
2016-05-31 17:45:05 -04:00
Irina Patru
0ba7983b9f Merge "init.rc: Remove cpu weight set on the root cgroup" am: 422492c506 am: 2618d90c2f am: 12397f202f
am: 403461f67d

* commit '403461f67d47e1156115d6e1be3925e48cb182f7':
  init.rc: Remove cpu weight set on the root cgroup

Change-Id: Iabaf0f78e60a5e3ac28f88d6951d49cde8717940
2016-05-12 18:22:58 +00:00
Irina Patru
12397f202f Merge "init.rc: Remove cpu weight set on the root cgroup" am: 422492c506
am: 2618d90c2f

* commit '2618d90c2fa3f952a195dfd4ecd9f92ec462bccb':
  init.rc: Remove cpu weight set on the root cgroup

Change-Id: I2663c368032a3c9f851de7d1e47f68c3a25b0d52
2016-05-12 18:13:14 +00:00
Irina Patru
c560c6310f init.rc: Remove cpu weight set on the root cgroup
It isn't allowed to change the cpu.share value for the root cgroup.
See kernel commit:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ec7dc8ac73e4a56ed03b673f026f08c0d547f597

This fixes the following error seen in dmesg:
init: write_file: Unable to write to '/dev/cpuctl/cpu.shares': Invalid argument

BUG: 28735908

Change-Id: I5ef359fb275792f99d13d35c62499026d354f6af
Signed-off-by: Irina Patru <irina.patru@intel.com>
2016-05-12 14:57:31 +03:00
Paul Lawrence
77e05cd29a Merge "Don\'t start defaultcrypto twice" into nyc-dev am: fe5d55a am: 1a920d7
am: fa3e4ea

* commit 'fa3e4ea7c3dec9e7715ac46553714b8493005bb1':
  Don't start defaultcrypto twice

Change-Id: I7d225afe784949d96e5a628d97c18f90c1038721
2016-04-19 14:52:45 +00:00
Paul Lawrence
1a920d72dc Merge "Don\'t start defaultcrypto twice" into nyc-dev
am: fe5d55a

* commit 'fe5d55a68b9dc3a593d3f6ee5be919b8a9de710c':
  Don't start defaultcrypto twice

Change-Id: I0e9a27208ea046a2cf738992ba97141da9026c08
2016-04-19 14:46:48 +00:00
Paul Lawrence
fe5d55a68b Merge "Don't start defaultcrypto twice" into nyc-dev 2016-04-19 14:44:26 +00:00
Paul Lawrence
1f99218612 Don't start defaultcrypto twice
The old way (using triggers) starts defaultcrypto twice because
queue_property_triggers_action retriggers the action.

Bug: 27452459
Change-Id: I48c844836f551673d0dbfed6c33bd8ee1e035f40
2016-04-18 15:37:31 -07:00
Jeff Sharkey
2deb078895 Merge "Create legacy /data/system/user directory." into nyc-dev am: e4f870a am: 2a9974a
am: 1b59b81

* commit '1b59b815bab116d11347011791c020981432a99d':
  Create legacy /data/system/user directory.

Change-Id: Ib1983ee798a81b316d055cf2f8c9a239bdfd1253
2016-04-18 20:18:03 +00:00
Jeff Sharkey
1b59b815ba Merge "Create legacy /data/system/user directory." into nyc-dev am: e4f870a
am: 2a9974a

* commit '2a9974a9682291f4e7dcbb2e940ac2e42a0d6c2c':
  Create legacy /data/system/user directory.

Change-Id: I20b29a6fb802966be184cb78534b4dd7d36eee66
2016-04-18 20:05:44 +00:00
Jeff Sharkey
0ef5c5cb20 Merge "Create legacy /data/system/user directory." into nyc-dev
am: e4f870a

* commit 'e4f870a0bb260f351208b9fe3cf7334e58c16a14':
  Create legacy /data/system/user directory.

Change-Id: I9b18134310c101974eb353d635c9cc8f8488877f
2016-04-18 19:59:34 +00:00
Jeff Sharkey
c9b84a362a Create legacy /data/system/user directory.
We create per-user directories under this location, so it should
only be created once by init, similar to all the other user-specific
directories.

Bug: 27896918
Change-Id: I9ec55e4fd763c0eda6c6e50483694a6377344586
2016-04-15 13:42:29 -06:00
Nick Kralevich
bc725db93a init.rc: Restore the /mnt/sdcard symlink am: d2f0a2c
am: bcf98cf

* commit 'bcf98cfcd40f2d408f601061ba1071b52d92ffbc':
  init.rc: Restore the /mnt/sdcard symlink

Change-Id: I50ec25bcc48f4cc312b8559b5985a8371feef5ae
2016-04-13 14:37:27 +00:00
Nick Kralevich
bcf98cfcd4 init.rc: Restore the /mnt/sdcard symlink
am: d2f0a2c

* commit 'd2f0a2c0653e332b906875077b9048e64b929d94':
  init.rc: Restore the /mnt/sdcard symlink

Change-Id: Icd4eea67bdf9ea416f1e15ec9f1666e74e85b3eb
2016-04-13 14:33:52 +00:00
Nick Kralevich
d2f0a2c065 init.rc: Restore the /mnt/sdcard symlink
"You are in a maze of twisty little symlinks, all alike."

Restore the /mnt/sdcard symlink, for compatibility with older Android
apps. This symlink was suppose to have been removed in the Gingerbread
time frame, but lives on.

Note: The /mnt/sdcard symlink was originally created in device specific
*.rc files in the device/vendor/hardware/* directory. This change moves
the creation of the symlink into the common init.rc file.

Bug: 25801877
Bug: 28108983
Change-Id: I2f9bf71bddffadb587d7376dfdfc8a546c84ec28
2016-04-12 20:36:01 -07:00
Daniel Rosenberg
afef45141f Merge "Set up configfs" into nyc-dev am: 290127b
am: 7972040

* commit '7972040588b1921c743d93a68435e095cb352858':
  Set up configfs
2016-03-17 21:18:45 +00:00
Daniel Rosenberg
7972040588 Merge "Set up configfs" into nyc-dev
am: 290127b

* commit '290127b29290c133f759eda3fc992e3dcbfb7cb1':
  Set up configfs
2016-03-17 21:16:24 +00:00
Daniel Rosenberg
4edec25396 Set up configfs
Bug: 19160983
Change-Id: I8fddf11fb6124950dfa2528a4f420abd9d461df6
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2016-03-16 15:58:24 -07:00
Janis Danisevskis
bae1efe500 Merge "Leftovers of the SELinux policy update mechanism" am: b9c0788806
am: 0af61f0024

* commit '0af61f0024d137e7a2f1ac0d9e002711cd01092c':
  Leftovers of the SELinux policy update mechanism
2016-03-13 14:55:12 +00:00
Janis Danisevskis
0af61f0024 Merge "Leftovers of the SELinux policy update mechanism"
am: b9c0788806

* commit 'b9c078880644b51bc9e6c314eed157f230fce43c':
  Leftovers of the SELinux policy update mechanism
2016-03-13 14:53:00 +00:00
Janis Danisevskis
3d1dff2231 Leftovers of the SELinux policy update mechanism
Remove references to SELinux policy files in /data/security
from libselinux/android.c. In the process all code that is
apparently related to handling an alternate policy and/or
reloading the policy has been removed.

Bug: 26544104
Change-Id: I47bf76ac3c26c5d71f92a21ffac2b17ba14262ea
2016-03-11 17:47:30 +00:00
Hidehiko Abe
ec8637ef6d Split slave-bind mount into two.
mount(2) does not work with MS_BIND | MS_SLAVE at a time.
Instead, this CL calls mount twice.

Change-Id: I36b2eb2853f19efc2b0677fb07b6822392aac37c
2016-03-09 16:41:50 +09:00
Alex Deymo
e120b471ac Add /postinstall partition when using the A/B updater.
The new top level directory /postinstall is used by the A/B updater to
mount the new partition and run a post-install program before rebooting
into that new system.

init.rc was extended to label this new directory since the initrd has
no extended attributes.

Bug: 27177071
TEST=`ls -laZ /` shows the /postinstall directory on edison-eng

(cherry picked from commit bb968fb04d)

Change-Id: Iff993135c7ce3a1a0f6450892ef7382da408fd5e
2016-03-04 15:45:52 -08:00
Alex Deymo
40345ef6b8 Merge "Add /postinstall partition when using the A/B updater." am: 700b15dacf
am: e2ad3cfae4

* commit 'e2ad3cfae4f9f9ddec2746c0c57cdb3dc1991a43':
  Add /postinstall partition when using the A/B updater.
2016-03-04 08:03:35 +00:00
Alex Deymo
e2ad3cfae4 Merge "Add /postinstall partition when using the A/B updater."
am: 700b15dacf

* commit '700b15dacfa42bcc5c4d768b92530e9f20f0211b':
  Add /postinstall partition when using the A/B updater.
2016-03-04 08:01:40 +00:00
Alex Deymo
bb968fb04d Add /postinstall partition when using the A/B updater.
The new top level directory /postinstall is used by the A/B updater to
mount the new partition and run a post-install program before rebooting
into that new system.

init.rc was extended to label this new directory since the initrd has
no extended attributes.

Bug: 27177071
TEST=`ls -laZ /` shows the /postinstall directory on edison-eng

Change-Id: I6cdee7eb1d61ac7d447528962a4fad1a7bbf138d
2016-03-02 14:17:42 -08:00
Keun Soo Yim
be54c543bd mkdir /data/misc/cameraserver for AVD's camera HALs
cameraserver from nyc uses cameraserver as its username.
thus this change is needed for AVD (android virtual device)'s
camera HAL which is attached to cameraserver to work as that
HAL writes some files to /data/misc/media. the backward compatibility
issue should be handled as separate changes. this approach is 
preferred for finer-grained security isolation.

Change-Id: If028667d62df8fcac634ff1001759c39703b00dd
2016-03-01 22:44:59 +00:00
Todd Kjos
d125f6e8a9 Merge "Mount schedTune cgroup as /dev/stune" into nyc-dev 2016-02-26 17:35:50 +00:00
Glenn Kasten
845a4ffef8 Restore audio tee sink
Bug: 27323882
Change-Id: I1131c0537942c8f7cbf9ff6cc6847ab7e93e6187
2016-02-23 15:23:46 -08:00
Todd Kjos
11cde567a8 Mount schedTune cgroup as /dev/stune
Make stune consistent with the other cgroups mounted under /dev

Change-Id: I0fe7120ad2afbe8e6a3c9f72cc3f465de618d344
2016-02-23 09:08:54 -08:00
Calin Juravle
aed972dead Merge "Create profiles folders" into nyc-dev 2016-02-22 11:42:02 +00:00
Jeff Sharkey
002aecf6e8 Temporary fix for bugreport symlink.
Bug: 27262109
Change-Id: I011da38f8ad1eeaf717dc03a0fb6f9fdc5654c4c
2016-02-19 15:51:42 -07:00
Calin Juravle
807f23aff2 Create profiles folders
Current profiles (the ones which have not been used for
compilation) are stored in /data/misc/profiles/cur/0/pkgname/.

Reference profiles (the merged of all user profiles, used for
compilation) are stored in /data/misc/profiles/ref/pkgname/.

Add a method to get the shared app gid from an uid or appid.

Bug: 26719109
Bug: 26563023
Change-Id: I89601d7dbeb3041df882c141a9127dac200a645e
2016-02-19 13:42:37 +00:00
Bill Yi
4409f1446c Merge commit '4352ee87fd74b931d4b58192fb8974e91aa899d0' into HEAD 2016-02-17 11:37:00 -08:00
Martijn Coenen
623b56af5d Fix libprocessgroup SELinux denials.
libprocessgroup checks whether it can use memory
cgroups for keeping track of forked processes by
seeing whether /dev/memcg/apps is writable. However,
on systems with memory cgroups disabled, SELinux
(correctly) no longer classifies this directory as a cgroup,
and starts denying zygote access. To fix this,
first check whether /dev/memcg/apps/tasks exists to
see if the cgroup is mounted; only then check whether
we can write to the directory.

Bug: 27046965
Change-Id: I6e44cd62d8c396e20ceb162c50606b3e86f2cb3e
2016-02-08 11:45:27 +01:00
Jeff Sharkey
c457610e78 Follow migration of Shell app to DE storage.
The Shell app that stores bugreports now lives under DE storage for
all devices, both FBE and non-FBE.

Bug: 26668510
Change-Id: Iead1dcb98181a5caccf4d0c1e86de62abc6dc990
2016-02-06 20:15:24 -07:00
Jeff Sharkey
3b9c83a0f6 User 0 directories are created by vold now.
This ensures that all users on device follow a consistent path for
setup and validation of encryption policy.

Also add remaining user-specific directories and fix linking order.

Bug: 25796509
Change-Id: I8c2e42a78569817f7f5ea03f54b743a6661fdb9c
2016-02-04 15:26:23 -07:00
Mark Salyzyn
95c220e6b7 Merge "init.rc: too many start logd" am: 989daeaf5b
am: d8e0e52099

* commit 'd8e0e520998e83ae16fcff317704bb6c00b7fb31':
  init.rc: too many start logd
2016-02-03 16:45:03 +00:00
Mark Salyzyn
d8e0e52099 Merge "init.rc: too many start logd"
am: 989daeaf5b

* commit '989daeaf5b2f50d96da69ad476adf434522e35e7':
  init.rc: too many start logd
2016-02-03 15:51:31 +00:00
Andreas Gampe
fcad79fe10 Merge "Init: add OTA directory" 2016-02-03 01:28:32 +00:00