Commit Graph

26636 Commits

Author SHA1 Message Date
Tomasz Wasilczyk f9026b1059 Merge "Fix typo in radio_metadata_t definition."
am: ae770a4728

Change-Id: Ib8f9a1fa915dfa5c0600a70a02674f8d0d7ea677
2017-01-12 22:56:01 +00:00
Tomasz Wasilczyk ae770a4728 Merge "Fix typo in radio_metadata_t definition." 2017-01-12 22:52:58 +00:00
Josh Gao 6865111e9c Merge "adb: remove support for legacy f_adb interface."
am: 72d4c42cd5

Change-Id: Ia23ec996c8ed9b40b23a347d1995197db8d45eb2
2017-01-12 21:33:16 +00:00
Alex Deymo 130546f2d0 Merge changes from topic 'host_suffix_cleanup'
am: 7e0b322978

Change-Id: Ie3847326761f7a8c6019f19d8700cd1e9613b34d
2017-01-12 21:33:00 +00:00
Alex Deymo 7b8d66e7cc Remove "_host" and "_static" suffix from libsparse definition.
am: b0c395955d

Change-Id: I8ac6f410a42046c18c29fae9a49479dfbd9bb50c
2017-01-12 21:27:53 +00:00
Alex Deymo c8f55cc5ca Remove "_static" and "_host" suffix from libext4_utils.
am: 705353ae27

Change-Id: I88ab21cc4412d89b831c0d601dbc98fcbcbe4ef4
2017-01-12 21:27:48 +00:00
Josh Gao 72d4c42cd5 Merge "adb: remove support for legacy f_adb interface." 2017-01-12 21:24:34 +00:00
Alex Deymo 7e0b322978 Merge changes from topic 'host_suffix_cleanup'
* changes:
  Remove "_host" and "_static" suffix from libsparse definition.
  Remove "_static" and "_host" suffix from libext4_utils.
2017-01-12 21:23:11 +00:00
Tomasz Wasilczyk 3eba74fec1 Fix typo in radio_metadata_t definition.
Test: none, this struct is opaque.
Change-Id: I6b8f5787441618a7a818c7d4595010d241574c13
2017-01-12 11:15:32 -08:00
Prashant Malani ab27993c18 Merge "fs_mgr: Fix disable-verity for verifyatboot partitions"
am: 6bc1d38381

Change-Id: I56d6cd59a80f288632ed7ce10ce8178ceb72bec2
2017-01-12 18:07:45 +00:00
Prashant Malani e36462f0f5 Merge "fs_mgr: Add support for at-boot verification"
am: 82db553dd9

Change-Id: I48dc83ed69cb32a4da3df83c72a5eb9d0865b3b2
2017-01-12 18:07:30 +00:00
Treehugger Robot 6bc1d38381 Merge "fs_mgr: Fix disable-verity for verifyatboot partitions" 2017-01-12 18:00:33 +00:00
Treehugger Robot 82db553dd9 Merge "fs_mgr: Add support for at-boot verification" 2017-01-12 17:59:59 +00:00
Alex Deymo b0c395955d Remove "_host" and "_static" suffix from libsparse definition.
This now combines all the "libsparse" libraries into the same soong
target. A minor side-effect of this change is that the libsparse
static library depends on the libz shared library instead of the libz
static library. This minor change has no effect since targets using
the static libsparse library need to explicitly include either the
static libz or the shared one.

Bug: 34220783
Change-Id: I8f41586cf4c3336791cfa57ab4f5ae59a76d7ffa
2017-01-11 19:15:11 -08:00
Paul Lawrence f014e41731 Merge "Set right attributes on tracing folder"
am: 5d8bf9e6e2

Change-Id: I9f2b023fe2cd311aa74dde52f0389eb72d80345e
2017-01-12 01:31:44 +00:00
Treehugger Robot 5d8bf9e6e2 Merge "Set right attributes on tracing folder" 2017-01-12 01:24:30 +00:00
Paul Lawrence 3d8ade3f24 Set right attributes on tracing folder
Since splitting tracefs out from debugfs, we now need to set the
attributes explicitly on tracing folder.

Test: Run adb shell atrace -c -b 16000 -t 5 gfx
Bug: 34197733
Change-Id: If2a962332b6d1ec227e289bdf952213756e26186
2017-01-11 15:51:25 -08:00
Josh Gao 183b73e665 adb: remove support for legacy f_adb interface.
Everything should be using the functionfs interface instead by now.

Bug: http://b/34228376
Test: grepping for f_adb, android_adb in source tree
Test: m
Change-Id: I6bc41049c49a867499832588dac8ed108c636c11
2017-01-11 15:00:03 -08:00
Alex Deymo 705353ae27 Remove "_static" and "_host" suffix from libext4_utils.
Bug: 34220783
Change-Id: I967dbaa9c48ad1feed2369c3a40f745b86a350f8
2017-01-11 14:05:42 -08:00
Mark Salyzyn c3b346ea93 Merge "liblog: use log/log.h when utilizing ALOG macros"
am: 01e12b4ee7

Change-Id: Ia2f121c5cec1cee98a51a36fa7c4d2e8a0f544a9
2017-01-11 19:15:19 +00:00
Mark Salyzyn 01e12b4ee7 Merge "liblog: use log/log.h when utilizing ALOG macros" 2017-01-11 19:07:17 +00:00
Mark Salyzyn 30f991f251 liblog: use log/log.h when utilizing ALOG macros
Test: compile
Bug: 30465923
Change-Id: Id6d76510819ebd88c3f5003d00d73a0dbe85e943
2017-01-11 09:31:15 -08:00
Neil Fuller 74777579fc Merge "Change tzdatacheck to account for bundle format changes"
am: 6540dfefca

Change-Id: Ia859f50f2c73c1b6900d4b7654ab2a8ba84a6fca
2017-01-11 14:54:01 +00:00
Neil Fuller 6540dfefca Merge "Change tzdatacheck to account for bundle format changes" 2017-01-11 14:46:47 +00:00
Prashant Malani 17f248d2e4 fs_mgr: Fix disable-verity for verifyatboot partitions
This allows a remount to be performed on partitions which have been
verified at boot, without causing the verity service to complain of
"corrupted" blocks that could have been modified as a result of a
remount (while the verity checksum remained unchanged).

(cherry picked from commit dd78ae75ff)

Bug: 32638755
Test: Compile
Change-Id: I77cf7dd20ee5c5f5dac80f73f292e32583fe5906
2017-01-11 22:05:16 +08:00
Prashant Malani 2cdc67eed5 fs_mgr: Add support for at-boot verification
Running dm-verity on heavily accessed partitions leads to performance
slowdowns, especially on low-RAM and slow-CPU devices.

This patch introduces a flag to allow an entire verified partition to be
read once at boot, to check for corruptions. If the reads are
successful, we can mount the partition as raw & read-only, and if not,
we can revert to mounting it as a verity partition, just like before.

Usage of this flag will entail a slowdown of time-to-boot, but should
lead to improvements in runtime performance.

(cherry picked from commit 34543c03e6)

Bug: 32433608
Test: Compile
Change-Id: I97717683a00ad6fa347e63b72b1a9bf1d2946315
2017-01-11 22:00:25 +08:00
Andre Eisenbach a398921635 Merge "Allow Bluetooth HAL to access /sys/class/rfkill"
am: 6ad690dfd4

Change-Id: I1988d864cfb3ed15dc2cc62e6efca554e018d448
2017-01-11 02:37:23 +00:00
Treehugger Robot 6ad690dfd4 Merge "Allow Bluetooth HAL to access /sys/class/rfkill" 2017-01-11 02:31:49 +00:00
Andre Eisenbach 8097210093 Allow Bluetooth HAL to access /sys/class/rfkill
Test: compiles; HAL can write rfkill state
Change-Id: I5815a1f50ef8d09bf83541a6d2389b61bd007306
2017-01-10 23:40:20 +00:00
Keun-young Park 3dccdc5ec5 Merge "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled"
am: f3780f3cc8

Change-Id: I6c288a2ef3b571fb6ab347468e06e15ea033363c
2017-01-10 19:55:58 +00:00
Treehugger Robot f3780f3cc8 Merge "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled" 2017-01-10 19:49:34 +00:00
Keun-young Park 22e8199175 e2fsck: drop -f when TARGET_USES_MKE2FS is enabled
- Drop forced (-f) e2fsck check when the product has
  enabled new ext4 generation by setting TARGET_USES_MKE2FS.
- The new generation tool is supposed to give better stability,
  thus justifying dropping -f.
- This should help reducing boot-up time as full check (-f) can
  increase boot-up time significantly depending on amount of data.

bug: 32246772
Test: many reboots
Change-Id: I631525bf7504bbfb025e170c8d24ad9d3ef3532e
2017-01-10 10:17:57 -08:00
Neil Fuller eec2bfb53b Change tzdatacheck to account for bundle format changes
Change tzdatacheck to account for bundle format changes:
The update bundle now contains a bundle_version file to enable
us to detect changes to the format of the files in addition to
just checking the IANA rules version. The version will be
incremented as we make incompatible changes to the structure
of the bundle (e.g. the files present or their names), the
file formats or the file contents.

The old assumption was that a system image would typically
contain newer rules than had been pushed via ConfigUpdater
and we'd never get rid of the tzdata file from the bundle
content.

If Android makes rule updates routinely or makes substantial
changes to the timezone data files between major releases
then this assumption becomes (even more) untenable.

The bundle_version file in the bundle is expected to contain
the ASCII bytes for "001". This could be extended
in a future version to include minor versioning information
(e.g. "002.001") and so the code here only reads the first
three bytes. This allows for a future change to add the minor
version suffix and optionally increment the major version if
required.

Some error conditions that were previously treated as fatal
are now handled more elegantly. Generally if things are not
as expected with the installed bundle in /data tzdatacheck
will attempt to delete it. The return code of the binary is
used to distinguish between failure cases, which will be
used in a future automated test.

Some of the ConfigUpdater deletion code has been temporarily
retained (with a TODO) so the v2 of the installer code can be
used with ConfigUpdater/ConfigInstaller and keep something
like the existing process working until we have replaced it
with some thing better.

Using the v2 installer code with ConfigInstaller is one
possible fallback if the new distribution approach is not
completed in time.

Bug: 31008728
Test: Manual testing
Change-Id: Ib253f7d4c9cd72d3e392754f4b787a98ec22bc53
2017-01-10 14:38:35 +00:00
Hung-ying Tyan 7da0c3db16 Merge "fs_mgr: add verify_dev flag to fs_mgr_setup_verity()"
am: abc26ed753

Change-Id: I25ade5d260a61c4af89d370471114b320eb4fe05
2017-01-10 04:07:03 +00:00
Treehugger Robot abc26ed753 Merge "fs_mgr: add verify_dev flag to fs_mgr_setup_verity()" 2017-01-10 04:00:19 +00:00
Tomasz Wasilczyk a6cbd75741 Merge "Make metadata field mandatory for program info struct."
am: e324500f3f

Change-Id: I21ffde4a3160cbf1d1c089a715cd0e61f977087e
2017-01-10 01:33:24 +00:00
Tomasz Wasilczyk e324500f3f Merge "Make metadata field mandatory for program info struct." 2017-01-10 01:24:27 +00:00
Elliott Hughes 5f57659030 Merge "Revert "Revert "android_ids: move to bionic"""
am: b2375fc40c

Change-Id: Ifc69bdc6668e173517206b75f9d1f0f7f28d8095
2017-01-10 01:23:33 +00:00
Elliott Hughes b2375fc40c Merge "Revert "Revert "android_ids: move to bionic""" 2017-01-10 01:15:30 +00:00
Tomasz Wasilczyk 70a8148b52 Make metadata field mandatory for program info struct.
Also, make metadata struct aligned.

Test: VTS, manual
Change-Id: I7dbd62d36ac21475fdbc49723ba3ea6744460d21
2017-01-09 14:26:43 -08:00
Mark Salyzyn 295f3ba442 Merge "liblog: retry -ENOTCONN | -ECONNREFUSED | -ENOENT indefinitely"
am: d5583867c6

Change-Id: I60b71aa34c305b5af0487a512b6f63f31caaaef3
2017-01-09 17:18:20 +00:00
Treehugger Robot d5583867c6 Merge "liblog: retry -ENOTCONN | -ECONNREFUSED | -ENOENT indefinitely" 2017-01-09 17:11:12 +00:00
Wei Wang 63c3065bdc Merge "Restart wificond when zygote died"
am: 7e6c19e8b8

Change-Id: If6bbfb9c68c83d7183e725818cd51ae5e9ed1573
2017-01-09 16:39:49 +00:00
Wei Wang 7e6c19e8b8 Merge "Restart wificond when zygote died" 2017-01-09 16:30:54 +00:00
Mark Salyzyn 65e1e6284c liblog: retry -ENOTCONN | -ECONNREFUSED | -ENOENT indefinitely
Deal with recovering after transitory failures surrounding logd
crash or recovery.  Improve the chances that the logging functions
can work in a signal handler, not officially supported, but making
sure logging is not blamed for system lockups when misused.

Reorder gTests so that setuid(AID_SYSTEM) is performed after
liblog.enoent test, and that this occurs after other tests that
like to see buffers with content in them as we stop logd.

Test: gTest liblog-unit-tests --gtest_filter=liblog.enoent
Bug: 33755074
Change-Id: I66f88599534614b7b61da6b2ae5fe099ebaced3a
2017-01-09 15:51:09 +00:00
Wei Wang 38fcd33e46 Restart wificond when zygote died
This helps to avoid tearDownInterfaces call from WiFiStateMachine's
constructor.

Bug: 33752168
Test: on device

(cherry picked from commit 0db195d0757e36c73b9da5a95d9b9986386f0f2e)

Change-Id: I55f56dd8daa5089073ff8dd424e92d09326c7d00
2017-01-07 19:45:42 -08:00
James Hawkins 449826ad8c Merge "bootstat: Log ro.boottime.init timing properties."
am: cdd7ec12be

Change-Id: Ia2ae2106b2140131498dfd53df17dd3c586aeb81
2017-01-07 22:19:45 +00:00
Treehugger Robot cdd7ec12be Merge "bootstat: Log ro.boottime.init timing properties." 2017-01-07 22:12:46 +00:00
Mark Salyzyn a7ce596bba Merge "liblog: test: switch to private event structures"
am: bfe1d9b83b

Change-Id: I997f81725348ac6566910c2142b6f4334ab0df34
2017-01-06 23:13:24 +00:00
Treehugger Robot bfe1d9b83b Merge "liblog: test: switch to private event structures" 2017-01-06 23:10:52 +00:00