Commit graph

46227 commits

Author SHA1 Message Date
Yifan Hong
2e62511bcb Merge "healthd: charger loads resources from /product" am: 9474063654
am: c85de61ada

Change-Id: I286f8d2a76b2559ef5cb7ddbcf06df9e7afd2078
2019-01-29 12:25:06 -08:00
Yifan Hong
c85de61ada Merge "healthd: charger loads resources from /product"
am: 9474063654

Change-Id: Ie720b289fa5ec9f3fdd11fdf02b9d12d71e3ba89
2019-01-29 12:16:55 -08:00
Yifan Hong
9474063654 Merge "healthd: charger loads resources from /product" 2019-01-29 19:57:11 +00:00
Florian Mayer
813f909a2e Merge "Allow to move frames out of Unwinder." am: 9f5e9978c2
am: 319f022506

Change-Id: I59d5ee18e3c59ad5f7e5e2ea299d0ae1c0ecc9b0
2019-01-29 11:47:00 -08:00
Florian Mayer
319f022506 Merge "Allow to move frames out of Unwinder."
am: 9f5e9978c2

Change-Id: I02d888bed24ba754f6b8449676ec7d90ee279f4b
2019-01-29 11:35:12 -08:00
Treehugger Robot
9f5e9978c2 Merge "Allow to move frames out of Unwinder." 2019-01-29 19:23:23 +00:00
Erick Reyes
f2dcb675d3 Merge "meminfo: Add memtrack dmabufinfo library" am: 2cbdc561ad
am: 3330640204

Change-Id: I197a094c99e450d16de30b4a02e6260ce424ce3c
2019-01-28 23:24:50 -08:00
Bowgo Tsai
fe578d0f17 Merge "Adding libfs_avb host tests into presubmit" am: c90b0eafda
am: 49ab41e7ab

Change-Id: Iabf27d8358d9861ba215ac7f8c2e73f68552d97b
2019-01-28 23:22:30 -08:00
Tom Cherry
064a64167d Merge "Remove extranous reading of fstab in BuilderTest::block_device_info" am: 47a4082f88
am: 9691e45085

Change-Id: Idd7bdce44b4e560bb22a163bb464f641f8f56315
2019-01-28 23:17:55 -08:00
Tom Cherry
cd12736426 Merge "Remove the rest of users of the old style fstab" am: 286684f835
am: 9eaed18adb

Change-Id: Ie3823464993f17e9335a31901d4b59a38a84451d
2019-01-28 23:11:38 -08:00
Martin Stjernholm
8da4c5243c Merge "Add libnativebridge.so link to vndk_lite linker config." am: 0b6d56e68b
am: 8f13a7f400

Change-Id: I9f8708a66775f2758a36f90b5a94da01280a1263
2019-01-28 23:05:33 -08:00
Tom Cherry
3ef8a6575f Merge "fs_mgr: remove old fs_mgr functions that are not currently used" am: 2648b801ed
am: acf95ae6d4

Change-Id: Id52aebb44ff620a5f200ac3386e71abf88189c53
2019-01-28 22:34:09 -08:00
Erick Reyes
3330640204 Merge "meminfo: Add memtrack dmabufinfo library"
am: 2cbdc561ad

Change-Id: I22ac7d6b6cbea81ca61c3271e8a63d2bac1767ce
2019-01-28 21:46:36 -08:00
Bowgo Tsai
49ab41e7ab Merge "Adding libfs_avb host tests into presubmit"
am: c90b0eafda

Change-Id: I1a07297380f718a22e44a35f9f997bdaed743978
2019-01-28 21:45:30 -08:00
Tom Cherry
9691e45085 Merge "Remove extranous reading of fstab in BuilderTest::block_device_info"
am: 47a4082f88

Change-Id: I9875a9075eacc1e0e556adee3f9411d91e44cd55
2019-01-28 21:44:17 -08:00
Tom Cherry
9eaed18adb Merge "Remove the rest of users of the old style fstab"
am: 286684f835

Change-Id: Ice6d3023349398b2ba5ed99588cc2f457377fb6d
2019-01-28 21:42:24 -08:00
Steven Moreland
0d9c2b3991 Merge "Move clang-formats to build." am: 66853db0a2
am: 9edd9ebe1d

Change-Id: I7170a1d515f7ce0c4c15c69da46db6f7ce9c005d
2019-01-28 21:39:28 -08:00
Martin Stjernholm
8f13a7f400 Merge "Add libnativebridge.so link to vndk_lite linker config."
am: 0b6d56e68b

Change-Id: Ic558af4547212e35e8725a0dab7db1b762cf9afd
2019-01-28 21:39:07 -08:00
Greg Kaiser
c5ba3e1014 Merge "adb: Fix incorrect logging statement" am: 32aaba6dcf
am: d13559092c

Change-Id: Ie9c66e2fc1d74172b3f2420c4d9dc9b7ba7d0c5a
2019-01-28 21:38:40 -08:00
Tom Cherry
308f20ba24 Merge changes Ibdecf0c9,I41bd92a7,I5669ed10 am: 561498e357
am: 80fba27032

Change-Id: Ideebaff704419c9a97d066ca97ead40935779118
2019-01-28 21:37:59 -08:00
Tom Cherry
acf95ae6d4 Merge "fs_mgr: remove old fs_mgr functions that are not currently used"
am: 2648b801ed

Change-Id: Id5cdb57603ccbf58f6c0cda3f071bbb27fabfe93
2019-01-28 21:34:02 -08:00
Steven Moreland
9edd9ebe1d Merge "Move clang-formats to build."
am: 66853db0a2

Change-Id: I005a7e056c9050ec927f59a7f195ddc3f7d39773
2019-01-28 20:09:07 -08:00
Greg Kaiser
d13559092c Merge "adb: Fix incorrect logging statement"
am: 32aaba6dcf

Change-Id: I7900ad07fceb4472744ca0d0c159960dde9dfabf
2019-01-28 20:08:32 -08:00
Tom Cherry
80fba27032 Merge changes Ibdecf0c9,I41bd92a7,I5669ed10
am: 561498e357

Change-Id: Ia0ba17bfee3d97dd4390f942ec7931c2b7a68ea6
2019-01-28 20:07:59 -08:00
Treehugger Robot
2cbdc561ad Merge "meminfo: Add memtrack dmabufinfo library" 2019-01-29 03:33:34 +00:00
Treehugger Robot
c90b0eafda Merge "Adding libfs_avb host tests into presubmit" 2019-01-29 01:46:41 +00:00
Treehugger Robot
47a4082f88 Merge "Remove extranous reading of fstab in BuilderTest::block_device_info" 2019-01-29 00:30:54 +00:00
Treehugger Robot
286684f835 Merge "Remove the rest of users of the old style fstab" 2019-01-29 00:29:09 +00:00
Treehugger Robot
0b6d56e68b Merge "Add libnativebridge.so link to vndk_lite linker config." 2019-01-28 22:49:15 +00:00
Yifan Hong
082d295fb3 healthd: charger loads resources from /product
Load resources from /product/etc/res/{values,images}/charger. If a
resource fails, falls back to /res/{values,images}/charger.

If the device has GSI flashed, resources may exist in both paths.
Resources in /product is used with a higher priority.

Test: turn off device, charge, observe animation
Bug: 119549685
Change-Id: I5a5143d132a0cc6ce9135469fb523feeeafd1b1b
2019-01-28 14:46:53 -08:00
Erick Reyes
d2918fe218 meminfo: Add memtrack dmabufinfo library
This is the userspace component for the improved shared memory buffer
tracking.

A new static library called libdmabufinfo will provide APIs to parse dmabuf
debugfs entries. The library can also map and read the file descriptors
per process to cross-reference the global data per process.

This change only adds a global API to read dmabuf stats from debugfs.

Bug: 63860998
Test: dmabufinfo_test
Change-Id: Ib0deedc73337a70875e03e07d3e9a692c4c33e63
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Erick Reyes <erickreyes@google.com>
Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-01-28 14:16:23 -08:00
Tom Cherry
b688d917cd Remove the rest of users of the old style fstab
And deprecate one more old style function that is not used after this
change.

Test: boot, disable and enable verity
Change-Id: Id509f479850120352b4ea4dc3b6c40f6e8e2e53e
2019-01-28 12:34:33 -08:00
Treehugger Robot
2648b801ed Merge "fs_mgr: remove old fs_mgr functions that are not currently used" 2019-01-28 20:27:23 +00:00
Treehugger Robot
66853db0a2 Merge "Move clang-formats to build." 2019-01-28 20:16:54 +00:00
Treehugger Robot
32aaba6dcf Merge "adb: Fix incorrect logging statement" 2019-01-28 20:10:50 +00:00
Martin Stjernholm
626c7ca588 Add libnativebridge.so link to vndk_lite linker config.
Getting it back in line with the normal ld.config.txt. This was missed in
http://r.android.com/854740.

Test: Flash and boot on marlin
Bug: 119867084
Bug: 113373927
Change-Id: Ic7e482133250eda20ff2c94c27bdee30e015ab5c
2019-01-28 19:11:29 +00:00
Tom Cherry
679a6bacc6 Remove extranous reading of fstab in BuilderTest::block_device_info
Previously information from the fstab was needed for this test, but
that's not longer the case, so skip reading the fstab altogether.

Test: build
Change-Id: I3989c62e19ae2d8606f2bc3a617f9cc3da0e5a6f
2019-01-28 11:04:18 -08:00
Florian Mayer
1c993b76bf Allow to move frames out of Unwinder.
This saves a copy for every unwind we do in heapprofd.

Change-Id: Ife7aa1ce68831729d96ccd4c3e54ca531f98b6bc
2019-01-28 17:11:07 +00:00
Tom Cherry
2f0331d9b6 fs_mgr: remove old fs_mgr functions that are not currently used
New code should be using the new Fstab class, so remove these older
functions that don't have current users.

Test: build
Change-Id: I3ba2b12b838b4b46979963869939fd4b65264738
2019-01-28 09:06:10 -08:00
Tom Cherry
561498e357 Merge changes Ibdecf0c9,I41bd92a7,I5669ed10
* changes:
  fs_mgr: test parsing all mount and fs mgr options
  fs_mgr: convert parse_flags over to C++
  fs_mgr: store file_contents_mode and file_names_mode directly
2019-01-28 16:52:25 +00:00
chenbruce
17cc1c07cc Merge "Linker namespace configuration for the Resolv APEX." am: 2d3ef2a22f
am: c114fa270d

Change-Id: Ibaa49c2d1c994e4062fd56cda8a5ed05354a6a69
2019-01-28 08:43:49 -08:00
chenbruce
c114fa270d Merge "Linker namespace configuration for the Resolv APEX."
am: 2d3ef2a22f

Change-Id: I8762937b9fce9c87f4b12903a5923973238e739d
2019-01-28 08:20:04 -08:00
Treehugger Robot
2d3ef2a22f Merge "Linker namespace configuration for the Resolv APEX." 2019-01-28 15:21:52 +00:00
Greg Kaiser
fdb9800fcc adb: Fix incorrect logging statement
We were logging "fd.get()" after we had already done a
"std::move(fd)".  That won't log the value we were hoping for.
We instead cache the file descriptor value in a local int prior
to the move(), and log that.

Test: TreeHugger
Change-Id: I715874ac63329280ffb55881fb2590fb31dc2457
2019-01-28 06:17:44 -08:00
Nicolas Geoffray
5e3f606bf4 Merge "Make runtime namespace visible." am: 3ea7785ee9
am: 79c48f1a83

Change-Id: Idf39f173275cb6721bc5972ffd37be57847df9f1
2019-01-28 01:35:34 -08:00
Nicolas Geoffray
79c48f1a83 Merge "Make runtime namespace visible."
am: 3ea7785ee9

Change-Id: I74058f6dd78784359a87603ab5002c07656b4443
2019-01-28 01:29:27 -08:00
Nicolas Geoffray
3ea7785ee9 Merge "Make runtime namespace visible." 2019-01-28 09:16:21 +00:00
chenbruce
aa87fd5f7d Linker namespace configuration for the Resolv APEX.
Support netd to load resolv Apex.
Switch namespaces when switching library paths between
/system and the APEX, so that internal library dependencies in both
locations are loaded from their own directory.

Bug: 119527674
Test: make; flash; lsof -p $(pidof netd)
Test: 1. manual test datacall/wifi work
      2. manual test tethering work
      3. system/netd/tests/runtests.sh
Change-Id: I3f69e85f2f529636f0ef29a2d9d71ad582c46dfb
2019-01-28 16:42:58 +08:00
Hridya Valsaraju
88693e5be7 Merge "Make 'fastboot boot' command support boot header version 2" am: b44996bfa9
am: 863e8fb3b7

Change-Id: If3f29c4bf71a2752f07963788a4c73a0c065549a
2019-01-27 21:47:00 -08:00
Hridya Valsaraju
863e8fb3b7 Merge "Make 'fastboot boot' command support boot header version 2"
am: b44996bfa9

Change-Id: I81239dd72347ebbe5360c2bcf9c158c84dd8cb79
2019-01-27 21:40:54 -08:00