Yabin Cui
41524c164d
Merge "init: write bootloader message directly." into nyc-dev am: a3a7a88
...
am: 52a302d
* commit '52a302d1e62c35112d8599e1b9ff20dc26b60970':
init: write bootloader message directly.
Change-Id: Iba4bc39834c18a31272948493710238a0c0bf959
2016-04-09 22:46:06 +00:00
Elliott Hughes
1fd281afc0
Merge "Remove debugging code for a fixed 3.6 kernel bug." am: af61acc
am: 058fd2e
...
am: 7b2d2d6
* commit '7b2d2d6afa480a834a006a8cf63e1e96eb85994b':
Remove debugging code for a fixed 3.6 kernel bug.
Change-Id: I34480b3592937f0e1c77661ea613555fde99c139
2016-04-09 22:46:05 +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
Yabin Cui
a3a7a886f5
Merge "init: write bootloader message directly." into nyc-dev
2016-04-08 21:03:43 +00:00
Alex Vakulenko
87db1082b5
Merge "metricsd: Remove release/aquire semantic from scoped_ptr/unique_ptr" am: a10b4a0
am: e957755
...
am: 817e5b4
* commit '817e5b4b59888730feba1768677132112b9a7d1c':
metricsd: Remove release/aquire semantic from scoped_ptr/unique_ptr
Change-Id: Ice57b0d26a5a729d548bcea711bc496efbde9478
2016-04-08 18:49:40 +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
Mohamad Ayyash
c221b40faf
Merge "Move canned_fs_config into libcutils" into nyc-dev am: 3f28318
...
am: fa7c7dd
* commit 'fa7c7dd87d5e99ca828077efc2253e9188e71bae':
Move canned_fs_config into libcutils
Change-Id: I4afb1a9a6fd7e48b9ce0d57edecb33e8ea641e1a
2016-04-08 18:10:42 +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
William Roberts
034ff0ab52
Merge "ueventd: convert to use pwd family of functions" am: 2c78f62
am: 1397e7a
...
am: c7f5af5
* commit 'c7f5af58d98ad989f1c6c865e92152a62b58d6d0':
ueventd: convert to use pwd family of functions
Change-Id: I5deb10d8cdf6c37bba20c6b7f15f283b4d0009ec
2016-04-08 01:59:22 +00:00
William Roberts
17be71c511
Merge "property_service: drop unused header" am: 1134925
am: b627a01
...
am: 2a651e6
* commit '2a651e603a945e8ae10ddddb889ee654779769bc':
property_service: drop unused header
Change-Id: I7345729982ee9a1c45e2ae690f36a78619fa017c
2016-04-08 01:59:22 +00:00
William Roberts
5427980c81
Merge "init: drop unused header android_filesystem_config.h" am: 54c27c7
am: 8cb6a9c
...
am: 6ba3710
* commit '6ba371065181d556ce8988b361f6a2816df1f696':
init: drop unused header android_filesystem_config.h
Change-Id: I1f5428f144aec520f547152f9bab7aafffed290c
2016-04-08 01:59:21 +00:00
William Roberts
3401117acb
Merge "init: switch from android_ids to getpwnam" am: 171504f
am: 43cbd05
...
am: ff37c38
* commit 'ff37c38bac299914712852e92d88c74d9b78aa27':
init: switch from android_ids to getpwnam
Change-Id: Ie976999e308ec7625a02cb2b5c0ab1fd21645669
2016-04-08 01:59:21 +00: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
1104035a5c
healthd: Add charge counter for BatteryProperties. am: 3f9886b
...
am: 8df54e7
* commit '8df54e7721c8ea51b2708963c7d943a4a9818098':
healthd: Add charge counter for BatteryProperties.
Change-Id: I6244716b259acfff9fd1a971eb85fa4c7b0edbc0
2016-04-08 01:23:08 +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
3a9ded038e
Merge "graphics.h: Add android_hdr_t" into nyc-dev am: 1dcf560
...
am: 76a9032
* commit '76a903224f8f5bea5faaec5d343130d1bb6a353b':
graphics.h: Add android_hdr_t
Change-Id: Id9b9dfcec1e40fcecf9bd38f373c819f5818ff08
2016-04-07 21:44:44 +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
476eff94c3
Give users and devices control over sdcardfs. am: 20ca983
...
am: 0762e99
* commit '0762e99064fca14fdc1ca4e43815acf07e270161':
Give users and devices control over sdcardfs.
Change-Id: Idf3eaccb09a6b4da4979f8a28b286fb396d811af
2016-04-07 18:09:11 +00: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
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
Greg Kaiser
65723f6034
Merge "Mutex: Note that STL is generally prefered" into nyc-dev am: a30a626
...
am: e60b407
* commit 'e60b407d43b63fc92ece0de32266e2c6650003cc':
Mutex: Note that STL is generally prefered
Change-Id: I65c41c41319f6b5961873bb035ed294c2a5d751b
2016-04-06 13:08:28 +00:00
Greg Kaiser
e60b407d43
Merge "Mutex: Note that STL is generally prefered" into nyc-dev
...
am: a30a626
* commit 'a30a6263d632a7d2dedc4f09c6707ab20df3fb1a':
Mutex: Note that STL is generally prefered
Change-Id: I69eec173bf9679dc592987bd78cc8edcc81a1fbb
2016-04-06 13:06:00 +00:00
Greg Kaiser
a30a6263d6
Merge "Mutex: Note that STL is generally prefered" into nyc-dev
2016-04-06 12:59:16 +00:00