Commit Graph

18125 Commits

Author SHA1 Message Date
Steve Fung 60cff75fe3 am d8cd9994: am fcc93587: Merge "crash_reporter: Update to use the os-release.d configs"
* commit 'd8cd99945704c439f766aac5e3388da92543a79b':
  crash_reporter: Update to use the os-release.d configs
2015-10-14 23:40:43 +00:00
Steve Fung d8cd999457 am fcc93587: Merge "crash_reporter: Update to use the os-release.d configs"
* commit 'fcc93587a19736f73a700c73a03be11b1dbde74d':
  crash_reporter: Update to use the os-release.d configs
2015-10-14 23:32:15 +00:00
Steve Fung fcc93587a1 Merge "crash_reporter: Update to use the os-release.d configs" 2015-10-14 22:48:25 +00:00
Christopher Ferris 1a3fb16f06 am a6be63e9: am 7d691756: Merge "Make allocations use unique_ptr."
* commit 'a6be63e9ab11eeb8d9820ef41449e7537c278a5d':
  Make allocations use unique_ptr.
2015-10-14 21:20:06 +00:00
Christopher Ferris a6be63e9ab am 7d691756: Merge "Make allocations use unique_ptr."
* commit '7d691756e8bcdbd66889f7c07c82fbcd07a8d793':
  Make allocations use unique_ptr.
2015-10-14 21:13:32 +00:00
Christopher Ferris 7d691756e8 Merge "Make allocations use unique_ptr." 2015-10-14 21:10:05 +00:00
Christopher Ferris 634df89db6 Make allocations use unique_ptr.
Change-Id: I4b84b8106faeaeb61847f8f9d13fd6444f474efd
2015-10-14 14:03:29 -07:00
Sami Tolvanen 0e5a3b44cf am 415f1bdc: am 4bd3148e: Merge "Revert "Error correction: Use libfec in fs_mgr""
* commit '415f1bdcbf22d605ea37e6eac2ed7447f61e9e53':
  Revert "Error correction: Use libfec in fs_mgr"
2015-10-14 19:57:02 +00:00
Sami Tolvanen 415f1bdcbf am 4bd3148e: Merge "Revert "Error correction: Use libfec in fs_mgr""
* commit '4bd3148e0f509efb75256a01959c9c1af9ffa845':
  Revert "Error correction: Use libfec in fs_mgr"
2015-10-14 19:52:24 +00:00
Sami Tolvanen 4bd3148e0f Merge "Revert "Error correction: Use libfec in fs_mgr"" 2015-10-14 19:47:59 +00:00
Sami Tolvanen 0923453462 Revert "Error correction: Use libfec in fs_mgr"
This reverts commit 3de3a0f351.

Change-Id: I1f121cbc4431b8d8ff146eab29832a8dda1eb8ba
2015-10-14 19:46:16 +00:00
Badhri Jagan Sridharan 8e6abbc394 am 4b542afe: am ba000511: Merge "adbd: Add os descriptor support for adb."
* commit '4b542afe05beb3820b980358e5d5eaba8a46e292':
  adbd: Add os descriptor support for adb.
2015-10-14 17:37:15 +00:00
Badhri Jagan Sridharan 4b542afe05 am ba000511: Merge "adbd: Add os descriptor support for adb."
* commit 'ba0005118b78dc8ff456492bb1e16947ab26be9e':
  adbd: Add os descriptor support for adb.
2015-10-14 17:32:55 +00:00
Badhri Jagan Sridharan ba0005118b Merge "adbd: Add os descriptor support for adb." 2015-10-14 17:28:53 +00:00
Sami Tolvanen 1d9bc9795b am 81ef6582: am a2cfddd3: Merge "Error correction: Use libfec in fs_mgr"
* commit '81ef65827c393ed39a2a217793466a1054fbbb2f':
  Error correction: Use libfec in fs_mgr
2015-10-14 16:43:53 +00:00
Sami Tolvanen 81ef65827c am a2cfddd3: Merge "Error correction: Use libfec in fs_mgr"
* commit 'a2cfddd37e950ed75d72e6a968d7be974aac405f':
  Error correction: Use libfec in fs_mgr
2015-10-14 16:40:33 +00:00
Sami Tolvanen a2cfddd37e Merge "Error correction: Use libfec in fs_mgr" 2015-10-14 16:35:51 +00:00
Steve Fung 72e3c828dc crash_reporter: Update to use the os-release.d configs
The product_id and product_version has been moved into the
/etc/os-release.d key-value store, update crash_reporter to
use these values.

Bug: 22874192
Change-Id: I71886574d1aa4e0a3ac18e1c361ec65684af9b49
2015-10-13 16:34:01 -07:00
Alex Vakulenko 72005422b5 am baae30d9: am 7d85a6a5: Merge "system/core: Rename "chromeos" -> "brillo" in include paths and namespaces"
* commit 'baae30d913b4048ff741310f835701369eccd3b2':
  system/core: Rename "chromeos" -> "brillo" in include paths and namespaces
2015-10-13 23:28:37 +00:00
Alex Vakulenko baae30d913 am 7d85a6a5: Merge "system/core: Rename "chromeos" -> "brillo" in include paths and namespaces"
* commit '7d85a6a56867c0380a0f652e3dd59abeff4f2baa':
  system/core: Rename "chromeos" -> "brillo" in include paths and namespaces
2015-10-13 23:18:19 +00:00
Alex Vakulenko 7d85a6a568 Merge "system/core: Rename "chromeos" -> "brillo" in include paths and namespaces" 2015-10-13 23:12:29 +00:00
Mark Salyzyn 400a6ed31c am ff5ef45e: am cee44732: Merge "logd: correct for number of elements in prune"
* commit 'ff5ef45e297e22c463b8adc2214dfb50856200d1':
  logd: correct for number of elements in prune
2015-10-13 22:30:10 +00:00
Alex Vakulenko 74dc62460b system/core: Rename "chromeos" -> "brillo" in include paths and namespaces
libchromeos is transitioning to libbrillo and chromeos namespaces
and include directory is changing to brillo.

Bug: 24872993
Change-Id: I797613a38c7444a113f12e38366a424388477276
2015-10-13 15:29:24 -07:00
Mark Salyzyn ff5ef45e29 am cee44732: Merge "logd: correct for number of elements in prune"
* commit 'cee44732e61c3e0f9491aa6cea78670ed6c9c89d':
  logd: correct for number of elements in prune
2015-10-13 22:25:43 +00:00
Mark Salyzyn cee44732e6 Merge "logd: correct for number of elements in prune" 2015-10-13 22:20:29 +00:00
Steve Fung 11e29cdcc8 am d7f17716: am 4f11a401: Merge "crash_reporter: Report the bdk_version"
* commit 'd7f1771608a0fbcd21537c9476fd6e8c68c2effb':
  crash_reporter: Report the bdk_version
2015-10-13 21:25:04 +00:00
Steve Fung d7f1771608 am 4f11a401: Merge "crash_reporter: Report the bdk_version"
* commit '4f11a401fc0e8714ed3554c5f9a197c5d21790a9':
  crash_reporter: Report the bdk_version
2015-10-13 21:19:01 +00:00
Steve Fung 4f11a401fc Merge "crash_reporter: Report the bdk_version" 2015-10-13 21:14:35 +00:00
Mark Salyzyn 58b8be8906 logd: correct for number of elements in prune
Chatty logs would distort the average log size by elevating the
elements, but not the size. Add statistical collection for the
number of elements that report chatty, and subtract that from
the number of elements to improve the pruning estimate. Pick
minElements as 1% rather than 10% of the total with this more
accurate number of elements, to a minumum of 4.

Bug: 24511000
Change-Id: I3f36558138aa0b2a50e4fac6440c3a8505d95276
2015-10-13 13:43:16 -07:00
Mark Salyzyn e9870dcbbc am 90486455: am 9b3a2784: Merge "logd: use coalesce instead of merge (cleanup)"
* commit '904864554e3ab8f4749972b17658722784ac3afa':
  logd: use coalesce instead of merge (cleanup)
2015-10-13 16:56:41 +00:00
Mark Salyzyn 904864554e am 9b3a2784: Merge "logd: use coalesce instead of merge (cleanup)"
* commit '9b3a2784b94d88492906384ab3f3c9863f6b5eea':
  logd: use coalesce instead of merge (cleanup)
2015-10-13 16:52:02 +00:00
Mark Salyzyn 9b3a2784b9 Merge "logd: use coalesce instead of merge (cleanup)" 2015-10-13 16:47:15 +00:00
Elliott Hughes 178ba4efa1 am 5a862a3d: am 2154e421: Merge "Switch to android::base::ReadFully"
* commit '5a862a3d5cb2025106fb9c9e4263d1c6fb06fd0b':
  Switch to android::base::ReadFully
2015-10-13 14:59:18 +00:00
Elliott Hughes 5a862a3d5c am 2154e421: Merge "Switch to android::base::ReadFully"
* commit '2154e421688679e6131a0d92486fa11a689e0034':
  Switch to android::base::ReadFully
2015-10-13 14:55:46 +00:00
Elliott Hughes 93ec2ec378 am fb4f25c8: am 73bf853e: Merge "Switch fs_mgr_verity.c to C++."
* commit 'fb4f25c8cd501661df37c32c55fad2aa4ce28dfc':
  Switch fs_mgr_verity.c to C++.
2015-10-13 14:55:25 +00:00
Sami Tolvanen 3de3a0f351 Error correction: Use libfec in fs_mgr
Use libfec to read and parse verity metadata to protect against data
corruption.

Bug: 21893453
Change-Id: Ieee6a1441e2f68148ba635235216e36c69b13db1
2015-10-13 15:53:25 +01:00
Elliott Hughes 2154e42168 Merge "Switch to android::base::ReadFully" 2015-10-13 14:50:22 +00:00
Johan Redestig 67b3cad9a0 Switch to android::base::ReadFully
The if (read(...size) != size) pattern is unreliable, switch
to the android base ReadFully which wraps read in a loop.

Change-Id: I2324e4c45da3c9b53b18df6eb09ce69a6604b5d1
2015-10-13 14:49:38 +00:00
Elliott Hughes fb4f25c8cd am 73bf853e: Merge "Switch fs_mgr_verity.c to C++."
* commit '73bf853edfd89c733fabb563a5dcd20a6599ffb9':
  Switch fs_mgr_verity.c to C++.
2015-10-13 14:49:01 +00:00
Elliott Hughes 73bf853edf Merge "Switch fs_mgr_verity.c to C++." 2015-10-13 14:43:47 +00:00
Sergio Giro 51209a8b93 am 9443fd94: am f8376607: Merge "system/core: fix iterator for LruCache"
* commit '9443fd94e3161c9c2c1401bb888d288d3dc5f218':
  system/core: fix iterator for LruCache
2015-10-13 07:41:30 +00:00
Sergio Giro 9443fd94e3 am f8376607: Merge "system/core: fix iterator for LruCache"
* commit 'f83766079e248e04065103a4720364c0193777ee':
  system/core: fix iterator for LruCache
2015-10-13 07:36:52 +00:00
Sergio Giro f83766079e Merge "system/core: fix iterator for LruCache" 2015-10-13 07:30:34 +00:00
Ruchi Kandoi 6acb240c53 am 43ed8e15: am 08cf0e55: Merge "healthd: Adds fake battery properties for devices with no battery." into mnc-dr-dev
* commit '43ed8e152214094c453048948877b1b4c7b29e23':
  healthd: Adds fake battery properties for devices with no battery.
2015-10-13 00:20:08 +00:00
Mark Salyzyn 16941feab3 am 7c009ac0: am 1c04253a: Merge "logd: object layer format statistics"
* commit '7c009ac097178678660d0c1109d31760ddb9b43a':
  logd: object layer format statistics
2015-10-12 22:17:49 +00:00
Mark Salyzyn 7c009ac097 am 1c04253a: Merge "logd: object layer format statistics"
* commit '1c04253af2077de0250e4082cadd4f9bfffc4ea2':
  logd: object layer format statistics
2015-10-12 22:14:26 +00:00
Mark Salyzyn 1c04253af2 Merge "logd: object layer format statistics" 2015-10-12 22:10:30 +00:00
Ruchi Kandoi 43ed8e1522 am 08cf0e55: Merge "healthd: Adds fake battery properties for devices with no battery." into mnc-dr-dev
* commit '08cf0e55a7c7e968d5f500d1ba01b9665077f0d4':
  healthd: Adds fake battery properties for devices with no battery.
2015-10-12 21:53:10 +00:00
Ruchi Kandoi 08cf0e55a7 Merge "healthd: Adds fake battery properties for devices with no battery." into mnc-dr-dev 2015-10-12 21:40:39 +00:00
Ruchi Kandoi 42a981ddee healthd: Adds fake battery properties for devices with no battery.
Devices which have no battery and are always plugged in will not have
any battery property initialized. This causes the 'stable power' to
never be switched which is required for updating apps.

This change recognizes such a device and manually sets the battery to
100% and charger status to connected to AC mains. It will also fake the
battery temperature.

Bug: 24258855
Change-Id: I98e5ed0dbeb7f2ab6d3802cd7e0f3a269bd8f31f
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2015-10-12 14:31:58 -07:00