Commit graph

22614 commits

Author SHA1 Message Date
Dimitry Ivanov
03890daa4e resolve merge conflicts of 663c998 to nyc-dev-plus-aosp
Change-Id: I73530375b015a7701acda1c6e0ddb5b4ca6a032c
2016-04-11 13:18:35 -07:00
Dimitry Ivanov
663c998b26 Merge "Allow vendors to extend the list of public libs"
am: dc727ef

* commit 'dc727ef1f0dc7fd9e780dfb529d02790a2c85e5a':
  Allow vendors to extend the list of public libs

Change-Id: Icfdf967fd60544065cff3bab883f6d511a2fcfd8
2016-04-11 20:08:49 +00:00
Dimitry Ivanov
dc727ef1f0 Merge "Allow vendors to extend the list of public libs" 2016-04-11 20:03:16 +00:00
James Hawkins
09eb597a38 Merge "bootstat: Differentiate system update boot times." am: a5fef89
am: fe0e70d

* commit 'fe0e70d3db1bf135a0826c22f00c121488dfeb95':
  bootstat: Differentiate system update boot times.

Change-Id: I87cede4d262189bb3d53850a29bad525f9712915
2016-04-11 17:19:55 +00:00
James Hawkins
fe0e70d3db Merge "bootstat: Differentiate system update boot times."
am: a5fef89

* commit 'a5fef898145b97fffdccf30199a952c42ff0ee4e':
  bootstat: Differentiate system update boot times.

Change-Id: I5f1f1828aa40630b33617834e2f2b9601a05964a
2016-04-11 17:14:56 +00:00
James Hawkins
a5fef89814 Merge "bootstat: Differentiate system update boot times." 2016-04-11 17:03:43 +00:00
Mark Salyzyn
c1bfe53f76 Merge "liblog: remove android_ids and replace with getpwuid" am: f7040c8
am: 4a7d498

* commit '4a7d498e2ff0ee58112710c04f284a24a3f88cd2':
  liblog: remove android_ids and replace with getpwuid

Change-Id: Idb750dd8944807cc14c265b388e2c058e17bbe53
2016-04-11 16:01:13 +00:00
William Roberts
4a7d498e2f Merge "liblog: remove android_ids and replace with getpwuid"
am: f7040c8

* commit 'f7040c8deedd1d64f740e7d9371fa3fa0d0638af':
  liblog: remove android_ids and replace with getpwuid

Change-Id: Iced0ca8a28cb2cf464b8a74942f8ed640358d577
2016-04-11 15:54:01 +00:00
Mark Salyzyn
f7040c8dee Merge "liblog: remove android_ids and replace with getpwuid" 2016-04-11 15:48:46 +00:00
William Roberts
8a5b9caaa6 liblog: remove android_ids and replace with getpwuid
Note: This code makes the assumption that getpwuid is
thread safe, which it is ONLY ON BIONIC. Thus,
if you attempt to use this on a non-target build, you
may get burned. Thus, an ifndef checking on __BIONIC__
is used to produce a build error if you attempt to do
so.

Change-Id: I61038c428b71771edcfc76f18d8fc5cbe349238b
Bug: 27999086
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-11 14:55:56 +00:00
Martijn Coenen
f063033a91 Merge "Update get_sched_policy to return TOP_APP correctly." into nyc-dev
am: 15fea7a

* commit '15fea7ae1a4a179bb2c2e4066bfbfb312eec56e0':
  Update get_sched_policy to return TOP_APP correctly.

Change-Id: I7406fcf2fdcb2a34ee3a81bf9f74dceddc22d316
2016-04-11 10:39:17 +00:00
Martijn Coenen
15fea7ae1a Merge "Update get_sched_policy to return TOP_APP correctly." into nyc-dev 2016-04-11 10:31:26 +00:00
Yabin Cui
52a302d1e6 Merge "init: write bootloader message directly." into nyc-dev
am: a3a7a88

* commit 'a3a7a886f5277b6223140761e58cea0753854225':
  init: write bootloader message directly.

Change-Id: I764e0288b40264b8e48fc09011c3c0475b71a04e
2016-04-09 00:35:26 +00:00
Elliott Hughes
7b2d2d6afa Merge "Remove debugging code for a fixed 3.6 kernel bug." am: af61acc
am: 058fd2e

* commit '058fd2edbcea9a6d224a3473fe8fdcb2f7735d37':
  Remove debugging code for a fixed 3.6 kernel bug.

Change-Id: I40ce05d262ab8e718fff4df8df7a41d2d6923e05
2016-04-09 00:31:32 +00:00
Elliott Hughes
058fd2edbc Merge "Remove debugging code for a fixed 3.6 kernel bug."
am: af61acc

* commit 'af61acc2920618f3cd635dc75dd5e3f417f503a8':
  Remove debugging code for a fixed 3.6 kernel bug.

Change-Id: Iaf60b0b2d5ff87dced048b8094c5d1753d3860b5
2016-04-09 00:29:14 +00:00
Elliott Hughes
af61acc292 Merge "Remove debugging code for a fixed 3.6 kernel bug." 2016-04-09 00:25:17 +00:00
James Hawkins
b9cf77159a bootstat: Differentiate system update boot times.
Bug: 27454343
Change-Id: Idb2e6f55ad7dda546a486954201619bb73cee6b0
2016-04-08 15:32:19 -07:00
Yabin Cui
a3a7a886f5 Merge "init: write bootloader message directly." into nyc-dev 2016-04-08 21:03:43 +00:00
Alex Vakulenko
817e5b4b59 Merge "metricsd: Remove release/aquire semantic from scoped_ptr/unique_ptr" am: a10b4a0
am: e957755

* commit 'e95775572937217b15ae4cca515155cc58e3996f':
  metricsd: Remove release/aquire semantic from scoped_ptr/unique_ptr

Change-Id: I00eee400301dddb8337983a1623d5fc354baca58
2016-04-08 18:41:23 +00:00
Alex Vakulenko
e957755729 Merge "metricsd: Remove release/aquire semantic from scoped_ptr/unique_ptr"
am: a10b4a0

* commit 'a10b4a0235ed5e3a219a41080988ece185f5dea8':
  metricsd: Remove release/aquire semantic from scoped_ptr/unique_ptr

Change-Id: I093b00db348ad722c69ff544eaa65bae34d95987
2016-04-08 18:28:35 +00:00
Yabin Cui
46e037980b init: write bootloader message directly.
Bug: 27176738
Change-Id: I8c95a193f3436c0893d5103760b700f3052888db
2016-04-08 11:05:56 -07:00
Alex Vakulenko
a10b4a0235 Merge "metricsd: Remove release/aquire semantic from scoped_ptr/unique_ptr" 2016-04-08 18:03:00 +00:00
Mohamad Ayyash
fa7c7dd87d Merge "Move canned_fs_config into libcutils" into nyc-dev
am: 3f28318

* commit '3f2831876107ad18422bd67a459e2070c66a3827':
  Move canned_fs_config into libcutils

Change-Id: I88019bfa08603b1df2f2cbe4c79e45f126d83a1b
2016-04-08 17:55:59 +00:00
Mohamad Ayyash
3f28318761 Merge "Move canned_fs_config into libcutils" into nyc-dev 2016-04-08 17:39:05 +00:00
Alex Vakulenko
7df991a21d metricsd: Remove release/aquire semantic from scoped_ptr/unique_ptr
Now that scoped_ptr is just a type alias to unique_ptr, there is no
longer a need to convert between the two by using .release() and
constructing the other with a raw pointer.

BUG: None
TEST: Built for dragonboard, all unit tests pass (except for update_engine,
      but those tests failed before these changes too).

Change-Id: Ibf0a094805d22d00ca10e1c67f68efb08c8677df
2016-04-08 09:59:05 -07:00
Mohamad Ayyash
8c788588f4 Move canned_fs_config into libcutils
It's no longer specific to make_ext4fs, will be used for mksquashfs as
well.

BUG: 27467028
Change-Id: I41b8c2b168ada45c8378dee522391edfb8f6b9a6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-07 22:44:00 -07:00
Elliott Hughes
c7f5af58d9 Merge "ueventd: convert to use pwd family of functions" am: 2c78f62
am: 1397e7a

* commit '1397e7af4b432d174dbbc7400cca9a00ce34ea5d':
  ueventd: convert to use pwd family of functions

Change-Id: I02c1d78835054bd296ce84586410bbcee1760a9c
2016-04-08 01:55:36 +00:00
Elliott Hughes
2a651e603a Merge "property_service: drop unused header" am: 1134925
am: b627a01

* commit 'b627a014b97a4ffdfe6d4ca4c2e47b61cd87321d':
  property_service: drop unused header

Change-Id: I44b28ece5694d811d55a3de963e95ca14ff68cb0
2016-04-08 01:55:36 +00:00
Elliott Hughes
6ba3710651 Merge "init: drop unused header android_filesystem_config.h" am: 54c27c7
am: 8cb6a9c

* commit '8cb6a9cdb7cb1feaff29914aa88c68399e32f14f':
  init: drop unused header android_filesystem_config.h

Change-Id: I1cc001c883199e8355e97d93a2f6ce0d46bdd767
2016-04-08 01:55:36 +00:00
Elliott Hughes
ff37c38bac Merge "init: switch from android_ids to getpwnam" am: 171504f
am: 43cbd05

* commit '43cbd0585b50996e1601dc6ed56e723aded810c8':
  init: switch from android_ids to getpwnam

Change-Id: I100993cfb07f23bb5b3079846d4e00f31d1a9794
2016-04-08 01:55:35 +00:00
William Roberts
1397e7af4b Merge "ueventd: convert to use pwd family of functions"
am: 2c78f62

* commit '2c78f62638b7743b2abdf01f6aded2506397d673':
  ueventd: convert to use pwd family of functions

Change-Id: Idb6555e08f4ccd904480b831ba2eb59f2dcce6c8
2016-04-08 01:51:38 +00:00
William Roberts
b627a014b9 Merge "property_service: drop unused header"
am: 1134925

* commit '1134925fb645df948387247aad4d3da7be1eb320':
  property_service: drop unused header

Change-Id: I86c954e936c4249900fe3680a3df254932eecd12
2016-04-08 01:51:37 +00:00
William Roberts
8cb6a9cdb7 Merge "init: drop unused header android_filesystem_config.h"
am: 54c27c7

* commit '54c27c7cf6a20fb74f054d41b414cd4124e9c1fe':
  init: drop unused header android_filesystem_config.h

Change-Id: I2a43f41a0020e5186c52766d8e5b701025650d19
2016-04-08 01:51:37 +00:00
William Roberts
43cbd0585b Merge "init: switch from android_ids to getpwnam"
am: 171504f

* commit '171504f8318b8d48c830bef3b9ff1451d76037b2':
  init: switch from android_ids to getpwnam

Change-Id: Idf79bfd2cf6436819447f12bce934329692012cd
2016-04-08 01:51:37 +00:00
Elliott Hughes
2c78f62638 Merge "ueventd: convert to use pwd family of functions" 2016-04-08 01:47:42 +00:00
Elliott Hughes
1134925fb6 Merge "property_service: drop unused header" 2016-04-08 01:42:45 +00:00
Elliott Hughes
54c27c7cf6 Merge "init: drop unused header android_filesystem_config.h" 2016-04-08 01:42:29 +00:00
Elliott Hughes
171504f831 Merge "init: switch from android_ids to getpwnam" 2016-04-08 01:42:09 +00:00
Ruchi Kandoi
8df54e7721 healthd: Add charge counter for BatteryProperties.
am: 3f9886b

* commit '3f9886bb0bce7297c676907ded51c402d7b61654':
  healthd: Add charge counter for BatteryProperties.

Change-Id: I4fbdeebcd50acae22712dde8a2192475051c9d96
2016-04-08 01:19:36 +00:00
Ruchi Kandoi
3f9886bb0b healthd: Add charge counter for BatteryProperties.
Bug: 27174034
Change-Id: I26de33714bb353faadb159d898f0b2142c76c657
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-04-07 23:10:14 +00:00
Dan Stoza
76a903224f Merge "graphics.h: Add android_hdr_t" into nyc-dev
am: 1dcf560

* commit '1dcf56080f7a396d57a9bd0e2c601f739a4bdf9a':
  graphics.h: Add android_hdr_t

Change-Id: I816d5741dfec2b9f69fd3d1e4426bf00b9b8cee7
2016-04-07 21:41:15 +00:00
Dan Stoza
1dcf56080f Merge "graphics.h: Add android_hdr_t" into nyc-dev 2016-04-07 21:32:53 +00:00
William Roberts
5b5a8ace61 ueventd: convert to use pwd family of functions
Switch ueventd to use the grp.h and pwd.h family of
functions for converting strings to uids. This removes the
need for using android_filesystem_config.h.

Change-Id: I25a6f536bb11683d5cd69a0d7b348d25a272dd3b
Bug: 27999086
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-07 13:38:43 -07:00
William Roberts
8e1dce8ba0 property_service: drop unused header
Remove android_filesystem_config.h since it was not being used.

Change-Id: I691513d50a3fdb7563a63aee7551137ba983825c
Bug: 27999086
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-07 13:38:43 -07:00
William Roberts
6df15704bd init: drop unused header android_filesystem_config.h
Change-Id: I66e637bc2d7fd5f385f40f150becfe515c53c19a
Bug: 27999086
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-07 13:38:43 -07:00
William Roberts
3792e6cf21 init: switch from android_ids to getpwnam
Start to move users of android_filesystem_config.h to use the
standard grp and pwd interface functions.

Advantages:
  * one copy of android_ids in libc, removing it from init objects.
  * immediately starts oem_xxx users and groups in rc.
  * future will support _named_ oem ids via backend improvements.

Change-Id: Ib1ae1e0cbdcaaf60deb3759681a6030b615c069c
Bug: 27999086
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-07 13:38:36 -07:00
Jeff Sharkey
0762e99064 Give users and devices control over sdcardfs.
am: 20ca983

* commit '20ca9836b9a780c41a22850f478a29f29677553e':
  Give users and devices control over sdcardfs.

Change-Id: I0144b346157952f79fdde5100f0fdc01daa58d9b
2016-04-07 18:05:28 +00:00
Jeff Sharkey
20ca9836b9 Give users and devices control over sdcardfs.
Instead of relying only on kernel support for sdcardfs, give each
device the ability to quickly toggle between sdcardfs and FUSE.  Also
add the ability to users to explicitly enable/disable the behavior
for testing and debugging purposes.

Bug: 27991427
Change-Id: Ie188cb044be2ad87166f2d43c32a1f6b97660de0
2016-04-07 11:05:22 -06:00
Dimitry Ivanov
617f495cf7 Allow vendors to extend the list of public libs
native_loader adds libraries specified in the
(optional) file: /vendor/etc/public.libraries.txt
to the list of public native libraries.

Bug: http://b/27073931
Change-Id: I927193cce99d48c3395bd0e6c373ae9fad0f13f4
2016-04-06 18:24:08 -07:00
Dan Stoza
7f7c1c5de6 graphics.h: Add android_hdr_t
Adds android_hdr_t, which specifies different types of high dynamic
range encodings to be used throughout the system.

Bug: 25684127
Change-Id: Ic92bb5dc64494e643b828a8e24af8760e74e2360
2016-04-06 14:52:10 -07:00