Commit Graph

28876 Commits

Author SHA1 Message Date
Tomasz Wasilczyk 0994121251 Merge "Fix typo in radio_metadata_t definition." 2017-01-12 19:09:09 +00:00
Prashant Malani 7ca3319421 Merge "fs_mgr: Fix disable-verity for verifyatboot partitions" am: 6bc1d38381 am: ab27993c18 am: 6635787941
am: 676c9fae14

Change-Id: I11fa17bc6d54cdde853c6dff4f51a9d491b3df99
2017-01-12 18:14:13 +00:00
Prashant Malani 7d858c442d Merge "fs_mgr: Add support for at-boot verification" am: 82db553dd9 am: e36462f0f5 am: de4b9427e1
am: 1fb1823aa8

Change-Id: I277a985ca9560848970b4580f4205ac72b9cdaf2
2017-01-12 18:14:00 +00:00
Prashant Malani 676c9fae14 Merge "fs_mgr: Fix disable-verity for verifyatboot partitions" am: 6bc1d38381 am: ab27993c18
am: 6635787941

Change-Id: I37c2c5d200c4c4fe349fdb32f97e1c1158b762d8
2017-01-12 18:12:11 +00:00
Prashant Malani 1fb1823aa8 Merge "fs_mgr: Add support for at-boot verification" am: 82db553dd9 am: e36462f0f5
am: de4b9427e1

Change-Id: I2c31c6be028f034693643a3424c477ee9ae45317
2017-01-12 18:11:58 +00:00
Prashant Malani 6635787941 Merge "fs_mgr: Fix disable-verity for verifyatboot partitions" am: 6bc1d38381
am: ab27993c18

Change-Id: I7f5e6a917e9bfcbd248ab56477be31561f44eb8e
2017-01-12 18:09:43 +00:00
Prashant Malani de4b9427e1 Merge "fs_mgr: Add support for at-boot verification" am: 82db553dd9
am: e36462f0f5

Change-Id: I9bb39fc3d6052a11a40b57a37b3e2f6b47127b7c
2017-01-12 18:09:29 +00: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
TreeHugger Robot 14adeef35a Merge "liblog: use log/log.h when utilizing ALOG macros" 2017-01-12 03:11:28 +00:00
Paul Lawrence 8cf0eba307 Merge "Set right attributes on tracing folder" am: 5d8bf9e6e2 am: f014e41731 am: 36eeceec84
am: 87b62dc44c

Change-Id: Ie1eeaf4d1e0dc63c80262376720abe96684a2590
2017-01-12 01:52:03 +00:00
Paul Lawrence 87b62dc44c Merge "Set right attributes on tracing folder" am: 5d8bf9e6e2 am: f014e41731
am: 36eeceec84

Change-Id: Idd6917f0af39e7b4cb20857cf11c9d2795a47d6e
2017-01-12 01:44:14 +00:00
Paul Lawrence 36eeceec84 Merge "Set right attributes on tracing folder" am: 5d8bf9e6e2
am: f014e41731

Change-Id: I000919a98192d639b8797e9c55e49f3cabd5ed4b
2017-01-12 01:38:11 +00: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
Mark Salyzyn b4c16851fe liblog: use log/log.h when utilizing ALOG macros
Test: compile
Bug: 30465923
Change-Id: Id6d76510819ebd88c3f5003d00d73a0dbe85e943
2017-01-11 16:12:13 -08: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
Mark Salyzyn 271a1a7cda resolve merge conflicts of a45b1d6f3 to master
Test: compile
Bug: 30465923
Change-Id: I648855539df3cfa176c6ecac19b6a562ba6feaf7
2017-01-11 11:41:38 -08:00
Mark Salyzyn a45b1d6f38 Merge "liblog: use log/log.h when utilizing ALOG macros" am: 01e12b4ee7 am: c3b346ea93
am: 5482cb01b2

Change-Id: Ifaf21912d44f6ee9fda06df255ba3f7a4ca26ed7
2017-01-11 19:26:19 +00:00
Mark Salyzyn 5482cb01b2 Merge "liblog: use log/log.h when utilizing ALOG macros" am: 01e12b4ee7
am: c3b346ea93

Change-Id: I0ee5652701e23d751def8bac82534af530ea5dc8
2017-01-11 19:20:50 +00: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 5f41003d1f Merge "Change tzdatacheck to account for bundle format changes" am: 6540dfefca am: 74777579fc am: 2553a20da9
am: dc78381399

Change-Id: I1e718a53437824c9a5b07dd2a6b58e587321d770
2017-01-11 16:23:32 +00:00
Neil Fuller dc78381399 Merge "Change tzdatacheck to account for bundle format changes" am: 6540dfefca am: 74777579fc
am: 2553a20da9

Change-Id: I0032728bc75ed6a6ed4891ed6e1a04282f25e473
2017-01-11 15:13:17 +00:00
Neil Fuller 2553a20da9 Merge "Change tzdatacheck to account for bundle format changes" am: 6540dfefca
am: 74777579fc

Change-Id: I120761f03466ec08c926237cb79e45fddd7c8f8f
2017-01-11 15:02:49 +00: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 511dd3b3b4 Merge "Allow Bluetooth HAL to access /sys/class/rfkill" am: 6ad690dfd4 am: a398921635 am: d969153aad
am: bb5ca97809

Change-Id: I348245df98cc42fb37555bb2fa7b904ff7a53713
2017-01-11 03:13:51 +00:00
Andre Eisenbach bb5ca97809 Merge "Allow Bluetooth HAL to access /sys/class/rfkill" am: 6ad690dfd4 am: a398921635
am: d969153aad

Change-Id: I2ca2589854e07ff5b77352e6c2cebcb67fa3eee6
2017-01-11 03:07:48 +00:00
Andre Eisenbach d969153aad Merge "Allow Bluetooth HAL to access /sys/class/rfkill" am: 6ad690dfd4
am: a398921635

Change-Id: I4d4fd3b01a30ffc2bcad7de0413197ed9a93f8ba
2017-01-11 02:51:58 +00: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 279be6fd51 Merge "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled" am: f3780f3cc8 am: 3dccdc5ec5 am: ef847af8bf
am: 300f488037

Change-Id: I50206232e1ea0b9e15e8638ccacf662d37b4e64b
2017-01-10 20:11:59 +00:00
Keun-young Park 300f488037 Merge "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled" am: f3780f3cc8 am: 3dccdc5ec5
am: ef847af8bf

Change-Id: Idfb7cfdad7c4ea1b1fe1821160878869cd33e179
2017-01-10 20:07:00 +00:00
Keun-young Park ef847af8bf Merge "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled" am: f3780f3cc8
am: 3dccdc5ec5

Change-Id: I514a3d79707cf2a795beec3f12b66911981410d0
2017-01-10 20:01:27 +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
Courtney Goeltzenleuchter 6769842f3a Merge "Add DISPLAY-P3 DATASPACE" 2017-01-10 18:31:46 +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 e54025ae28 Merge "fs_mgr: add verify_dev flag to fs_mgr_setup_verity()" am: abc26ed753 am: 7da0c3db16 am: 70bcce4deb
am: 82f542f5a1

Change-Id: I427f830f6021a0abde66e9db200a9ce6ba8ddcea
2017-01-10 04:22:35 +00:00
Hung-ying Tyan 82f542f5a1 Merge "fs_mgr: add verify_dev flag to fs_mgr_setup_verity()" am: abc26ed753 am: 7da0c3db16
am: 70bcce4deb

Change-Id: I7a44cc2f7a3e12d931ee116c25e0f4ce73c32e72
2017-01-10 04:16:35 +00:00
Hung-ying Tyan 70bcce4deb Merge "fs_mgr: add verify_dev flag to fs_mgr_setup_verity()" am: abc26ed753
am: 7da0c3db16

Change-Id: I0f513c6e794cf5973a1e376bd10d834760ccb708
2017-01-10 04:12:04 +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