Commit graph

27357 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
098f30839e Merge "Make metadata field mandatory for program info struct." am: e324500f3f am: a6cbd75741
am: 7435361107

Change-Id: Ic051cdebeeb3ff81432415f55928f44fb2fc7889
2017-01-10 01:42:54 +00:00
Tomasz Wasilczyk
7435361107 Merge "Make metadata field mandatory for program info struct." am: e324500f3f
am: a6cbd75741

Change-Id: I726325d06787a8a916874fb17b6627035a9b799d
2017-01-10 01:37:56 +00:00
Elliott Hughes
86e63c8ae6 Merge "Revert "Revert "android_ids: move to bionic""" am: b2375fc40c am: 5f57659030
am: 15f24e5df9

Change-Id: I718ecb5674a2ce85de4116ece310af404614e45c
2017-01-10 01:33:37 +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
Elliott Hughes
15f24e5df9 Merge "Revert "Revert "android_ids: move to bionic""" am: b2375fc40c
am: 5f57659030

Change-Id: I3a09908f05e410e899e757f3710278d3a32ed2c5
2017-01-10 01:28:11 +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
ed5f3d8bb2 Merge "liblog: retry -ENOTCONN | -ECONNREFUSED | -ENOENT indefinitely" am: d5583867c6 am: 295f3ba442
am: 4935c99659

Change-Id: I43501d70194c5300b7ff347a1fb884278edeaf31
2017-01-09 17:27:21 +00:00
Mark Salyzyn
4935c99659 Merge "liblog: retry -ENOTCONN | -ECONNREFUSED | -ENOENT indefinitely" am: d5583867c6
am: 295f3ba442

Change-Id: Ica7b00f403b7dafcd20961d28b56365036b32566
2017-01-09 17:22:51 +00: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
95d24cdefc Merge "Restart wificond when zygote died" am: 7e6c19e8b8 am: 63c3065bdc
am: f44214c444

Change-Id: I17061da1b2857b9339878cd4ca027425652bcb5a
2017-01-09 16:49:18 +00:00
Wei Wang
f44214c444 Merge "Restart wificond when zygote died" am: 7e6c19e8b8
am: 63c3065bdc

Change-Id: I547f5fbfcf1560785a83bef56282c7ee2cbf855c
2017-01-09 16:44:48 +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
053b0b002c Merge "bootstat: Log ro.boottime.init timing properties." am: cdd7ec12be am: 449826ad8c
am: 953117a0c9

Change-Id: I24741ee49590f20743a81b5a42b7ab3dc40c902d
2017-01-07 22:28:46 +00:00
James Hawkins
953117a0c9 Merge "bootstat: Log ro.boottime.init timing properties." am: cdd7ec12be
am: 449826ad8c

Change-Id: If893c6b1524e093cdf28a927906cb4cf639cecfb
2017-01-07 22:24:16 +00:00