Commit Graph

1208 Commits

Author SHA1 Message Date
Srinath Sridharan 492883c839 Merge "Only apply schedTune boost to top-app tasks" into nyc-mr1-dev am: 87a4f046f0
am: e7b8d06f18

* commit 'e7b8d06f186450977426cb07b5ee212cdc93246d':
  Only apply schedTune boost to top-app tasks

Change-Id: I25d51e00c5dfc1e3bca359c6332bd388a37c513c
2016-05-24 00:20:41 +00:00
Srinath Sridharan e7b8d06f18 Merge "Only apply schedTune boost to top-app tasks" into nyc-mr1-dev
am: 87a4f046f0

* commit '87a4f046f01ff49d69e4ff2446266c29557fb5e1':
  Only apply schedTune boost to top-app tasks

Change-Id: I32ec1f0811971a527234672cadeeddcb50fd1369
2016-05-24 00:14:03 +00:00
Srinath Sridharan 87a4f046f0 Merge "Only apply schedTune boost to top-app tasks" into nyc-mr1-dev 2016-05-24 00:00:06 +00:00
Srinath Sridharan 1339871138 Only apply schedTune boost to top-app tasks
When using EAS, the foreground tasks were all getting boosted
during touchboosts. Limit it to top-app tasks.


BUG: 28378389
Change-Id: I72b7158a614bfd9b6c61024774e408ceba61fc9c
2016-05-23 23:59:38 +00:00
Badhri Jagan Sridharan 032a45f435 Merge "init: usb: disable usb function switch until adbd is ready" am: 2a26c2a836 am: b61ecb5213 am: 7e11db1b32
am: 66d69b902f

* commit '66d69b902f4ba15f2d2ad6b3d8214ae3355076cd':
  init: usb: disable usb function switch until adbd is ready

Change-Id: Ib9022f062bece4a7fee2772df1d8f917c04f8e55
2016-05-16 19:53:30 +00:00
Winter Wang 66d69b902f Merge "init: usb: disable usb function switch until adbd is ready" am: 2a26c2a836 am: b61ecb5213
am: 7e11db1b32

* commit '7e11db1b3206cd92d52fca0b324f6a5260a68aec':
  init: usb: disable usb function switch until adbd is ready

Change-Id: I12e8fab36f39a9b97e52ace30ab54b3a9fd7bf0f
2016-05-16 19:48:39 +00:00
Badhri Jagan Sridharan 7e11db1b32 Merge "init: usb: disable usb function switch until adbd is ready" am: 2a26c2a836
am: b61ecb5213

* commit 'b61ecb5213e1c94e823f23d7f5a8a0a93db617d6':
  init: usb: disable usb function switch until adbd is ready

Change-Id: I5fc733ee946b4d0accf58f56c80270f9e13d9f63
2016-05-16 19:43:50 +00:00
Badhri Jagan Sridharan 2a26c2a836 Merge "init: usb: disable usb function switch until adbd is ready" 2016-05-16 19:34:51 +00:00
Patrick Tjin f44442215d Create symlink in the case where device has no cache partition am: c6535a343f
am: 31788415ed

* commit '31788415ed6d89eba11ee757f04ff32ee260a7c1':
  Create symlink in the case where device has no cache partition

Change-Id: Ic5813d8f9fab4a02d6e0fab4add2fa0a8a72c008
2016-05-14 03:39:11 +00:00
Patrick Tjin 31788415ed Create symlink in the case where device has no cache partition
am: c6535a343f

* commit 'c6535a343f0b0bdd0f4171f0b4c9be401beebf77':
  Create symlink in the case where device has no cache partition

Change-Id: Ibcec898104e6509e70647576611ecc7d887f163d
2016-05-14 03:36:41 +00:00
Patrick Tjin c6535a343f Create symlink in the case where device has no cache partition
Create symlink from /cache to /data/cache for devices
which have no cache partition.

Bug: 28747374
Change-Id: Ifb0c3250f1be345ce46fcdb78533e36c2250bb85
2016-05-13 15:25:04 -07: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 403461f67d Merge "init.rc: Remove cpu weight set on the root cgroup" am: 422492c506 am: 2618d90c2f
am: 12397f202f

* commit '12397f202f97da7dcd40d45159696bc6be50aaf6':
  init.rc: Remove cpu weight set on the root cgroup

Change-Id: I256d702368c1b4ed8688006abb5202dcc0d11f83
2016-05-12 18:16:09 +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
Srinath Sridharan 54c2ab9732 marlin/eas: Fixing foreground/schedtune.boost path. am: 7ac34d0
am: f746166

* commit 'f746166fdc627d48a3e8b3a6baf0a86cd93b7271':
  marlin/eas: Fixing foreground/schedtune.boost path.

Change-Id: I8e5a7a6742bbec4a5d00e852780e827bb7833f52
2016-04-26 16:36:50 +00:00
Srinath Sridharan f746166fdc marlin/eas: Fixing foreground/schedtune.boost path.
am: 7ac34d0

* commit '7ac34d08efb3290bab77c6ed3bbbec067aeddf09':
  marlin/eas: Fixing foreground/schedtune.boost path.

Change-Id: I0a549cb1fe0e5bd5ce89a7178d1468f808f175f7
2016-04-25 23:23:49 +00:00
Srinath Sridharan 7ac34d08ef marlin/eas: Fixing foreground/schedtune.boost path.
BUG: 28378389
Change-Id: I613fd5622d3d27deafe6054bbf2a4799d97f9170
2016-04-25 13:09:05 -07: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
Winter Wang 46c313b694 init: usb: disable usb function switch until adbd is ready
In the case of adb enabled, When a usb function switch happens
e.g mtp,adb -> ptp,adb, framework will set sys.usb.config from
"mtp,adb" to "none" and stop adbd first.
At this time, the property "sys.usb.ffs.ready", which is set after
the ready of the perious start adbd, is still "1".
So , when framework goes on setting the sys.usb.config to "ptp,adb",
init.usb.configfs.rc will trigger actions to bind() f_fs without
waiting for adbd is actually ready.

This will produce some error messages:
------------
configfs-gadget ci_hdrc.0: failed to start g1: -19
init: write_file: Unable to write to '/config/usb_gadget/g1/UDC': No such device
------------
this error msg is caused by configFS start binding f_fs before adbd is ready.

Add setting the "sys.usb.ffs.ready" to "0" will help clear this error msg,
as the bind process in kernel gadget driver will wait for the set of
this property, which is the sign of adbd is ready.

Signed-off-by: Winter Wang <wente.wang@nxp.com>
2016-04-08 19:23:00 +08:00
Eino-Ville Talvala 7c17b0c87d Add camera2 NDK library to public library lists am: 5f31ca2
am: 3c30fe1

* commit '3c30fe1106c5a0b52d387231e3dd87c192edebf1':
  Add camera2 NDK library to public library lists
2016-03-18 19:48:43 +00:00
Eino-Ville Talvala 3c30fe1106 Add camera2 NDK library to public library lists
am: 5f31ca2

* commit '5f31ca2231a2d743b09d0f9f902d20b30a4baca7':
  Add camera2 NDK library to public library lists
2016-03-18 19:46:26 +00:00
Eino-Ville Talvala 5f31ca2231 Add camera2 NDK library to public library lists
It was dropped in the migration to the public.libraries format
NDK is the same on standard Android and Wear.

Bug: 27742249
Change-Id: I1eafbb649c0ccc5b9a93471fa387624d838bd3d0
2016-03-18 12:33:19 -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 290127b292 Merge "Set up configfs" into nyc-dev 2016-03-17 21:11:03 +00:00
Dimitry Ivanov 5e11727101 Merge "Add libvulkan.so to the list of public libraries" into nyc-dev am: eb43104
am: 44837bd

* commit '44837bd892abababf0884ad3a882268f2808b196':
  Add libvulkan.so to the list of public libraries
2016-03-17 19:34:28 +00:00
Dimitry Ivanov 8239061a22 Merge changes from topic \'fix-nativeloader-todo\' into nyc-dev am: c8bc211
am: 0583bc6

* commit '0583bc610b56dfba646d16e5ee88131b6b918cdd':
  Move list of public libraries to a config file
  Revert "libnativeloader: Make webviewchromium so file optional"
2016-03-17 19:34:28 +00:00
Dimitry Ivanov 44837bd892 Merge "Add libvulkan.so to the list of public libraries" into nyc-dev
am: eb43104

* commit 'eb43104db148976581c6525b12b1abf25f65987b':
  Add libvulkan.so to the list of public libraries
2016-03-17 18:21:15 +00:00
Dimitry Ivanov 0583bc610b Merge changes from topic \'fix-nativeloader-todo\' into nyc-dev
am: c8bc211

* commit 'c8bc211e6658cf56c5ac8ff5217a1d9a3a64143b':
  Move list of public libraries to a config file
  Revert "libnativeloader: Make webviewchromium so file optional"
2016-03-17 18:21:15 +00:00
Dimitry Ivanov dbae9a9b77 Add libvulkan.so to the list of public libraries
Accidentally dropped it in 4b0e963872

Bug: http://b/27546414
Change-Id: I28835ce3229f778387efedf269d7f32572e09184
2016-03-17 10:57:22 -07:00
Dimitry Ivanov d1fdb98830 Move list of public libraries to a config file
This list contains libraries that should directly or indirectly
be accessible to apps for the platform. Note that this list is
not device specific but rather device class specific.

For now we have 2 separate lists; one for Android Phones and Tablets,
and another one for Android Wear devices.

Bug: http://b/27546414
Bug: http://b/22548808
Change-Id: I83de5e3cf67392d0e9af66f70123898bd5997146
(cherry picked from commit 4b0e963872)
2016-03-17 10:54:19 -07:00
Dimitry Ivanov 4b0e963872 Move list of public libraries to a config file
This list contains libraries that should directly or indirectly
be accessible to apps for the platform. Note that this list is
not device specific but rather device class specific.

For now we have 2 separate lists; one for Android Phones and Tablets,
and another one for Android Wear devices.

Bug: http://b/27546414
Bug: http://b/22548808
Change-Id: I83de5e3cf67392d0e9af66f70123898bd5997146
2016-03-17 09:45:52 -07: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
Mihai Serban e45d59b05b Merge "init-debug.rc: mount debugfs" am: bf6c67f234
am: 8bf6e6908b

* commit '8bf6e6908b97f785b5d7036e616438f839e9da1d':
  init-debug.rc: mount debugfs
2016-03-14 18:08:23 +00:00
Mihai Serban 8bf6e6908b Merge "init-debug.rc: mount debugfs"
am: bf6c67f234

* commit 'bf6c67f234b591afd3cf936632ca00730b89eb73':
  init-debug.rc: mount debugfs
2016-03-14 18:06:27 +00:00
Elliott Hughes bf6c67f234 Merge "init-debug.rc: mount debugfs" 2016-03-14 17:57:16 +00: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