Change-Id: Iec073f76f53d996c8e14ae0685252380db9e3b68

Change-Id: Ifb7caac89190e351384337bbedaadde8bbfcf974

Change-Id: Ieaf0181a9835e5361321c2bbd57d5b93a3b5be11

Change-Id: I630f10ec57e9ac6636118166313cd06ef9a9ed20

Change-Id: Ic6b0e77c67452e102b4b03aa521e21d6603f8484

Change-Id: Ica9ebe72b8cb2d81f2f0a3665f6c10849d9c77cd

Change-Id: I6ca66799e2d45f19e069df0597bd79c1dc7d5ca9

Change-Id: I1d1d7d354844d971b662240df5ad00f3fb3a1123

Change-Id: Ibda89cd76910f523a53eae3f3b14c952e768cbeb

Change-Id: I02c16cb82184afb944efab3f7f1b8ebefc63c0e9

Change-Id: I82efa701a5519db7a6dc355565c9f22cc8e4a2fd

Change-Id: I81858f0c1b75195164b7783f3f901347cf887814

Change-Id: Ib7dcdcb8537b4ce3b22f13a894f5984b445447e2

Change-Id: If35cbb64c105491b3751f6f7374c8bd5326a8ade

Change-Id: I73669e3e99e50145fdb4af8cf702c35d640120f3

Change-Id: I3e052874b692206379145c6a72ee68a83ccc05a8

Add a declaration for ext4_bg_has_super_block() so that the
encrypt-in-place code in vold can use it to determine whether a backup
superblock is present in a block group.

Bug: 162479411
Bug: 161871210
Merged-In: Ic090bf4e88193b289b04c5254ddf661ef40b037e
Change-Id: Ic090bf4e88193b289b04c5254ddf661ef40b037e

Change-Id: I3cece9a2e4de9f09e946f76b00fb277fca02633b

Change-Id: Ie224cbfaed2ec99e62018b76d7a2f5c556940ccc

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

Change-Id: I81a7887d7274c2fc93904d119f7d5b48cc6714ce

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

Change-Id: Ifde03a5f1d91740c4b353d7ee6a71f48eaa5e45d

Execute the commands with the API version where the command was
introduced. This makes it possible to run the v1.0 HAL commands on
a device where v1.1 HAL implementation is not available.

Without this patch, on devices that only support bootcontrol v1.0 API,
bootctl would just fail with error message.

Bug: 160405575
Test: Execute command on device that only implements v1.0 API
    adb shell bootctl hal-info
Change-Id: I56e9a81bcae49b6859b04394d571b5151a235675
Signed-off-by: Håkan Kvist <hakan.kvist@sony.com>
Signed-off-by: Alessio Balsini <balsini@google.com>

Change-Id: Ia0cc09904bd952fed6fd3fe9f7a028accfd9be04

[automerger skipped] Merge spl-2020-06-05 Change-Id: Id5b1b9c4d6ddd09eefc4d42087cf00084484698f skipped: 988d0ce1

Change-Id: I151b7527db880e4964de4f33ec681c1b30412b8a

Change-Id: If249ca523a2417e52d171aef56b39310c7fe19da

Change-Id: I9a1a9247c987048f4e666504af6b884076804657

Change-Id: Ife386df07c3ef578ec5bec5d5cae6568b45da4e8

Change-Id: I850380fc9f36d21f69615c3454ade4dc658543f4

Change-Id: Ia633872d63a12c43ee6d492eee2aea252ddbc827

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

Change-Id: Ieb7defcfe0e15ee413eea8573ae2ea3d913388cd

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

Change-Id: I8dce95af33f6704e287a72849c6846f37dfce346

Bug:158702468
Test: Run bootanalyze and see there is no error when the
event time is 0

Change-Id: If3efa4c33a70cf6168a777f0f442fe1557b600b4

Change-Id: Id5b1b9c4d6ddd09eefc4d42087cf00084484698f

Change-Id: I243c143dbd4ef96559a60bc4468de19fcd3226f0

Change-Id: Ia1daaa7e4e6bcf88fc6bc4b8e36d18b1ac1e09c9

Change-Id: Iad7d55ba99cd81a867ede44fd7b46472881a94d2

Change-Id: I593e886146d5d69fc70d17e22c23cf2e704ba5d4

simpleperf: add Broadcom STB into whitelist, omit tests requiring hw counters. am: 756a972f am: edbaad6e

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

Change-Id: Ifc9655287544bc309ee1ea875e7813cb8c265456

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

Change-Id: Ibf73c7aca5e698ce98b4e7a3a955ab746e8d1121

Some Socs like Broadcom STB will not be available when
disable jtag(non-invasive debug), so omit tests requiring
hw counters on them.

Bug: 158095412
Bug: 154157678
Test: run cts -m CtsSimpleperfTestCases -t record_cmd#generate_samples_by_hw_counters
Test: hw counters.
Change-Id: Iddfb34bfa1d66e37398bb162f8e1cfa645d756f4
Merged-In: Iddfb34bfa1d66e37398bb162f8e1cfa645d756f4
(cherry picked from commit 572c226d)