Commit graph

65340 commits

Author SHA1 Message Date
Yifan Hong
4a16991925 Merge "Fix allowlist for unreliable pinning." am: 0198ce0ca7 am: 833c1b98b3 am: 1d662dabac am: 81a8c65958
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393698

Change-Id: I153f393e0f2c8412f69e47f42483f849101897f4
2020-08-07 18:50:49 +00:00
Yifan Hong
d0e1e58e60 Merge "libsnapshot_test: skip global setup on non-VAB devices." am: 75d5e98401 am: 60e1be9200 am: 464e1794b6 am: 4a19df5b4b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393640

Change-Id: Ifc0497e379b7e89b0d32634b7184cbfd6ae272f2
2020-08-07 18:50:38 +00:00
Treehugger Robot
6d86a9f0a5 Merge "logd: consolidate command handling and fix an error check" am: 2666aaba84 am: 6252e97df4 am: 73c52ce2d4 am: 536bf76c23
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393638

Change-Id: Ic48a043e7401c9cd04ed9fb11a790ac6aa856d74
2020-08-07 18:50:15 +00:00
Yifan Hong
81a8c65958 Merge "Fix allowlist for unreliable pinning." am: 0198ce0ca7 am: 833c1b98b3 am: 1d662dabac
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393698

Change-Id: Ib0979ba2dcb18d417eb87d85cda71e6dc8133f7b
2020-08-07 18:34:50 +00:00
Yifan Hong
4a19df5b4b Merge "libsnapshot_test: skip global setup on non-VAB devices." am: 75d5e98401 am: 60e1be9200 am: 464e1794b6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393640

Change-Id: I7754439e4bf4ef17545b162f48829e0c7b5d0080
2020-08-07 18:34:37 +00:00
Treehugger Robot
536bf76c23 Merge "logd: consolidate command handling and fix an error check" am: 2666aaba84 am: 6252e97df4 am: 73c52ce2d4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393638

Change-Id: Ifc06c300723a46b964ed8f7a66dbc23409136bce
2020-08-07 18:34:19 +00:00
Yifan Hong
1d662dabac Merge "Fix allowlist for unreliable pinning." am: 0198ce0ca7 am: 833c1b98b3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393698

Change-Id: I7cbf81d40e1996811faf4a36b0bde44c22a2acf8
2020-08-07 18:15:22 +00:00
Yifan Hong
464e1794b6 Merge "libsnapshot_test: skip global setup on non-VAB devices." am: 75d5e98401 am: 60e1be9200
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393640

Change-Id: If778631e1c2d7d8551eb17cd8579b9801885df00
2020-08-07 18:15:10 +00:00
Treehugger Robot
73c52ce2d4 Merge "logd: consolidate command handling and fix an error check" am: 2666aaba84 am: 6252e97df4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393638

Change-Id: Ib6ac8cde20b8177b542d31eaf9ca3b268173dcd6
2020-08-07 18:14:53 +00:00
Yifan Hong
833c1b98b3 Merge "Fix allowlist for unreliable pinning." am: 0198ce0ca7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393698

Change-Id: I73c57a7fa8bceadc2b5bb71c92f353574a25ab33
2020-08-07 17:58:25 +00:00
Yifan Hong
60e1be9200 Merge "libsnapshot_test: skip global setup on non-VAB devices." am: 75d5e98401
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393640

Change-Id: I78c01b7ad442a1a98278d6f3664828308be1eb77
2020-08-07 17:58:14 +00:00
Treehugger Robot
6252e97df4 Merge "logd: consolidate command handling and fix an error check" am: 2666aaba84
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393638

Change-Id: I01ec49a6f32a647e5e33df83abda206f51da31f1
2020-08-07 17:57:59 +00:00
Yifan Hong
0198ce0ca7 Merge "Fix allowlist for unreliable pinning." 2020-08-07 17:57:13 +00:00
Yifan Hong
75d5e98401 Merge "libsnapshot_test: skip global setup on non-VAB devices." 2020-08-07 17:57:00 +00:00
Treehugger Robot
2666aaba84 Merge "logd: consolidate command handling and fix an error check" 2020-08-07 17:41:14 +00:00
Tom Cherry
94b299ab43 logd: consolidate command handling and fix an error check
Consolidate command handling for commands that take a buffer ID as
their first argument.  Further use ParseUint instead of atoi(), since
atoi("bad string") returns `0` is the same as LOG_ID_MAIN.

Test: these commands are handled property
Test: `echo -n 'getLogSize ignoreme!\0' | nc -U /dev/socket/logd`
      returns an error
Change-Id: I3e84a6157e16f4c110681da453e1ae1a920da7c4
2020-08-07 09:48:16 -07:00
Treehugger Robot
43fdec23dc Merge "Delete fiemap_image_test_presubmit" am: 4b3229b216 am: f0461b29d8 am: 528edca935 am: e665c0ae9e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393701

Change-Id: I3b9fdd0f40af04c4421fbb68673eaa54855f1e08
2020-08-07 03:32:41 +00:00
Treehugger Robot
e665c0ae9e Merge "Delete fiemap_image_test_presubmit" am: 4b3229b216 am: f0461b29d8 am: 528edca935
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393701

Change-Id: Ia4dbc329fa6f6b532cce6e2e24c2a716f614743f
2020-08-07 03:21:12 +00:00
Treehugger Robot
528edca935 Merge "Delete fiemap_image_test_presubmit" am: 4b3229b216 am: f0461b29d8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393701

Change-Id: Ic54f32b0f09092bb230bc9d658522c1cdb49473e
2020-08-07 03:01:28 +00:00
Eric Biggers
549f5bcae0 [automerger skipped] fs_mgr: Revert "Try to recover corrupted ext4 /data with backup superblock" am: 7a6e620447 -s ours
am skip reason: Change-Id I279f84c072bc6c8d3e251a5e95c78f8d6c0d50ba with SHA-1 dc3e897a88 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12323458

Change-Id: Ifa6b6d1c91c99b82753d379366b08143ec7a03ca
2020-08-07 02:53:54 +00:00
Yifan Hong
9a69cf9c62 Merge changes from topic "healthd_test" am: 17ed9c4fb6 am: 0074cc1831 am: b9671b7642 am: 2a8fc44e98
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1392638

Change-Id: I6c1f2d9100a6b79c758083795deda6d07eef8f50
2020-08-07 02:45:29 +00:00
Treehugger Robot
f0461b29d8 Merge "Delete fiemap_image_test_presubmit" am: 4b3229b216
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393701

Change-Id: I9093ec3808d44890d7ca9e09b6d78f7908c97c97
2020-08-07 02:43:25 +00:00
Treehugger Robot
4b3229b216 Merge "Delete fiemap_image_test_presubmit" 2020-08-07 02:23:13 +00:00
Yifan Hong
2a8fc44e98 Merge changes from topic "healthd_test" am: 17ed9c4fb6 am: 0074cc1831 am: b9671b7642
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1392638

Change-Id: I2f91d535d7a5c7336cef1acfff0a839e73b67a3f
2020-08-07 01:42:47 +00:00
Yifan Hong
b9671b7642 Merge changes from topic "healthd_test" am: 17ed9c4fb6 am: 0074cc1831
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1392638

Change-Id: I19e59b376088e1a6b7637fb12b585cf9eccbb215
2020-08-07 01:28:28 +00:00
Yifan Hong
0074cc1831 Merge changes from topic "healthd_test" am: 17ed9c4fb6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1392638

Change-Id: I5410990c3b920f655bd73c1e218c06855a851333
2020-08-07 01:14:28 +00:00
Yifan Hong
17ed9c4fb6 Merge changes from topic "healthd_test"
* changes:
  Add libhealthd_charger_test to presubmit.
  Convert healthd_test to Soong
  Fix AnimationParser remove_prefix test
2020-08-07 00:38:50 +00:00
Yifan Hong
f0cb5a04f3 Delete fiemap_image_test_presubmit
No tests are skipped in presubmit now.

Test: presubmit
Fixes: 148874852

Change-Id: Ic0ce7489ff4a92ab90986dd76f836c262f5aa3fc
2020-08-06 17:38:02 -07:00
Yifan Hong
a7c00a0943 libsnapshot_test: skip global setup on non-VAB devices.
On non-VAB devices, fake super image creation may fail because it
may not support f2fs file pinning.

Also changes global setup to a testing::Environment object because it is
the recommended way in gtest's guide. SnapshotTestEnvironement::TearDown
is automatically executed before RUN_ALL_TEST returns.

Test: vts_libsnapshot_test
Test: make IsVirtualAbEnabled() return false, then all tests are
skipped.

Bug: 162557082
Change-Id: I1382f9a4ddec146fa2d8cfb21ac66ca22a2e110f
2020-08-06 17:21:50 -07:00
Tom Cherry
3bbbd1864e Merge "Query log size properties only within logd" am: ca0a46aefa am: b19bbaeb41 am: 6cf4ca0c5b am: c40246fe26
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1390949

Change-Id: Ieb6c400ff10c1536e9f37db477b57050a225e270
2020-08-06 23:14:26 +00:00
Tom Cherry
c40246fe26 Merge "Query log size properties only within logd" am: ca0a46aefa am: b19bbaeb41 am: 6cf4ca0c5b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1390949

Change-Id: I697164a87d0856f067ef823df2b84820a5295c63
2020-08-06 22:56:24 +00:00
Tom Cherry
6cf4ca0c5b Merge "Query log size properties only within logd" am: ca0a46aefa am: b19bbaeb41
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1390949

Change-Id: I2d546639ec9d43cc700673565ea284f2ef083d85
2020-08-06 22:36:27 +00:00
Tom Cherry
b19bbaeb41 Merge "Query log size properties only within logd" am: ca0a46aefa
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1390949

Change-Id: Ib26c90b96f0ae2c13563b84b6724a35f8d734f24
2020-08-06 22:14:57 +00:00
Yifan Hong
900fdf47ce Fix allowlist for unreliable pinning.
When checking IsUnreliablePinningAllowed, the existing code calls
IsTestDir on a value starts with "/data", but IsTestDir expects
metadata_dir_. Fix it.

Also, make subdir checks more robust and add test cases for IsSubdir.

Fixes: 162557082
Test: vts_libsnapshot_test
Test: fiemap_image_test

Change-Id: I495cfae3da11d1e0800b8abf520df10dd9a29dce
2020-08-06 15:02:56 -07:00
Tom Cherry
ca0a46aefa Merge "Query log size properties only within logd" 2020-08-06 22:00:29 +00:00
Tom Cherry
39dc221026 Query log size properties only within logd
liblog exposed __android_logger_get_buffer_size() which queries log
size properties, but that should not be a generic library function.
Logd should be the only process that queries these properties and
other processes should query the actual used log sizes from logd via
the android_logger_get_log_*_size() functions.

Also, always use 1MB for log buffer tests, instead of just on host and
various other clean up related to improper types.

Test: log buffers are correctly sized
Merged-In: I9b7c86bf58e569618737afe9097cf1c4d4e61d95
Change-Id: I9b7c86bf58e569618737afe9097cf1c4d4e61d95
2020-08-06 20:32:45 +00:00
Treehugger Robot
7ca39fbe80 Merge "Add the rough toybox version numbers to the docs." am: b96cc0bfd2 am: fef53055e1 am: 515af88f52 am: a580848ff3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1392868

Change-Id: Id48152dd3601dd550747880310b597c1e625d280
2020-08-06 19:44:47 +00:00
Treehugger Robot
a580848ff3 Merge "Add the rough toybox version numbers to the docs." am: b96cc0bfd2 am: fef53055e1 am: 515af88f52
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1392868

Change-Id: If1eb4782368f322d0dc68865241318e4015964c8
2020-08-06 19:24:02 +00:00
Treehugger Robot
515af88f52 Merge "Add the rough toybox version numbers to the docs." am: b96cc0bfd2 am: fef53055e1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1392868

Change-Id: I7678e1a060302f1766cebc7c70c80c015de731c5
2020-08-06 19:02:35 +00:00
Treehugger Robot
fef53055e1 Merge "Add the rough toybox version numbers to the docs." am: b96cc0bfd2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1392868

Change-Id: Ifcf4d254c1455c9dc25264f17733c95b6e61507b
2020-08-06 18:48:23 +00:00
Treehugger Robot
e1a704eb14 Merge "cts: Skip CtsInitTestCases over a native bridge." am: 30e542983a am: 356a6f52b6 am: d2c5ab1397 am: 431968aa91
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393376

Change-Id: Idac0a5f275c3bc3b8db05ceee60e8da2a3c1c650
2020-08-06 18:47:09 +00:00
Treehugger Robot
b96cc0bfd2 Merge "Add the rough toybox version numbers to the docs." 2020-08-06 18:30:15 +00:00
Treehugger Robot
431968aa91 Merge "cts: Skip CtsInitTestCases over a native bridge." am: 30e542983a am: 356a6f52b6 am: d2c5ab1397
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393376

Change-Id: Ie539199b64cb636f6d31388fe5b0d9482ca4cbb8
2020-08-06 18:26:08 +00:00
Treehugger Robot
d2c5ab1397 Merge "cts: Skip CtsInitTestCases over a native bridge." am: 30e542983a am: 356a6f52b6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393376

Change-Id: I953a02b3fc6dce63242c6140cf9a171438392325
2020-08-06 18:08:38 +00:00
Treehugger Robot
356a6f52b6 Merge "cts: Skip CtsInitTestCases over a native bridge." am: 30e542983a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393376

Change-Id: Ie33a733bb93d55d83d67802001f9218db10b4fd4
2020-08-06 17:51:46 +00:00
Christopher Ferris
ce2385ad16 Merge "Add new caps from kernel 5.8." am: c625ea6137 am: 4a59a24c0b am: 8e435ba5c6 am: 4acde5751c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1389265

Change-Id: I2f395799f79d669507aea137f2b7ca79c6e231c2
2020-08-06 17:39:42 +00:00
Treehugger Robot
30e542983a Merge "cts: Skip CtsInitTestCases over a native bridge." 2020-08-06 17:31:56 +00:00
Christopher Ferris
4acde5751c Merge "Add new caps from kernel 5.8." am: c625ea6137 am: 4a59a24c0b am: 8e435ba5c6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1389265

Change-Id: I40dec2b086780a3e48dd661cafdb66fb420fb9dd
2020-08-06 17:24:12 +00:00
Elliott Hughes
60dfa184a7 Add the rough toybox version numbers to the docs.
Bug: https://github.com/landley/toybox/issues/230
Test: treehugger
Change-Id: I007cb2fd5fc4b2258394e7472c12df4acb25ebcc
2020-08-06 10:15:25 -07:00
Christopher Ferris
8e435ba5c6 Merge "Add new caps from kernel 5.8." am: c625ea6137 am: 4a59a24c0b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1389265

Change-Id: I582010cb6ee184eb53e66b3ba554aaea3f4b88df
2020-08-06 17:05:42 +00:00