Commit Graph

9577 Commits

Author SHA1 Message Date
Treehugger Robot e248e434ea Merge "update_verifier: Support AVB." 2017-06-22 19:15:15 +00:00
Tao Bao 171b4c4cbe screen_ui: Allow setting screen margin space.
We already have outer_width and outer_height in wear UI, and x_offset
and y_offset in VR UI. This CL adds margin_width_ and margin_height_ to
their base class (ScreenRecoveryUI) to shorten the gap. This will be in
general useful for round or round-cornered screens.

Move the density computation to ScreenRecoveryUI ctor so that the value
can be used earlier.

Bug: 62732748
Test: Setting and not setting margin_{width,height}_ on angler. Check the
      recovery texts (recovery menu as well as 'View recovery logs').
Change-Id: Ibf6238c9cc8949a42ed8a410e1c09d55b0b5a151
(cherry picked from commit 87f4650874)
2017-06-20 15:47:06 -07:00
Tao Bao 87f4650874 screen_ui: Allow setting screen margin space.
For round screen or screens with rounded corners, we don't want to show
texts within the margin which could otherwise be invisible.

Move the density computation to ScreenRecoveryUI ctor so that the value
can be used earlier.

Note that this is similar to the existing stuff in wear UI (outer_width,
outer_height). This CL gets ScreenRecoveryUI and WearRecoveryUI one-step
closer.

Bug: 62732748
Test: Setting and not setting margin_{width,height}_ on angler. Check the
      recovery texts (recovery menu as well as 'View recovery logs').
Change-Id: Ibf6238c9cc8949a42ed8a410e1c09d55b0b5a151
2017-06-20 13:19:22 -07:00
android-build-team Robot 1a02970803 release-request-f3bcfb00-8080-4b95-b497-7457f544b4f6-for-git_oc-mr1-release-4116097 snap-temp-L44400000075746008
Change-Id: Ie7100b9de834612c1307d19a11856dc1cac823f1
2017-06-20 07:34:33 +00:00
Jin Qian ac31808cd3 recovery: replace make_ext4 with e2fsprogs
Execute mke2fs to create empty ext4 filesystem.
Execute e2fsdroid to add files to filesystem.

Test: enter recovery mode and wipe data
Bug: 35219933
Change-Id: I10a9f4c1f4754ad864b2df45b1f879180ab33876
2017-06-19 19:22:24 +00:00
android-build-team Robot d844da48bf release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release-4111654 snap-temp-L22900000075285650
Change-Id: Ibdcef56c2c72412b40007223cade5eb4d9b48315
2017-06-18 07:30:15 +00:00
android-build-team Robot 43348a6282 release-request-f4ecf242-5d1c-45e0-8c7c-ede48d1a9e82-for-git_oc-release-4111650 snap-temp-L02200000075283731
Change-Id: Id1b274b254753d4ee0fc788092ef6a62f86efd92
2017-06-18 07:12:19 +00:00
nkk71 9efbe769c3 Fix incorrect 'unlink' return value check
Change-Id: I430f6bb21a5fd87e0422420463e8bb96c4a612e1
2017-06-17 14:21:47 +02:00
bigbiff bigbiff 56cf564658 twrpDigest refactor
This patch is to refactor twrpDigest using polymorphism
and inheritance to use the same call patterns for creating and
reading a digest. Now a library.
Use SHA2 from libcrypto. SHA2 is default if device has libcrypto.

Change string MD5 everywhere to use digest or Digest instead. Updated
string tags to digest. Translation will be required.

Switch out digest code into a driver class from partitionmanager.

SHA2 is better for digest creation due to decreased collision space
compared to MD5 and SHA1.

See https://en.wikipedia.org/wiki/SHA-2

Change-Id: I74b5546789990b12aa4ce2e389d25f80a3fe213f
2017-06-17 07:05:45 -05:00
Luke Song cdbfbb04bd Merge "Introduce VR recovery ui" am: 5efe2bca22 am: 850e00951a am: 8daabacce5
am: e003fbaa2e

Change-Id: Id250042bae68eb4b2d93cfdeb1c7ec3a36d1e507
2017-06-17 00:47:27 +00:00
Luke Song e003fbaa2e Merge "Introduce VR recovery ui" am: 5efe2bca22 am: 850e00951a
am: 8daabacce5

Change-Id: I7aaad686f788672b9fd8be2173c7b9976c19e04f
2017-06-17 00:20:39 +00:00
Luke Song 8daabacce5 Merge "Introduce VR recovery ui" am: 5efe2bca22
am: 850e00951a

Change-Id: I498b7b568523631f41f92994a003e77492616916
2017-06-17 00:11:37 +00:00
Luke Song 850e00951a Merge "Introduce VR recovery ui"
am: 5efe2bca22

Change-Id: I5fb663d9922866aa57e0afcd6d86f3afdf0de8c9
2017-06-17 00:09:37 +00:00
Treehugger Robot 5efe2bca22 Merge "Introduce VR recovery ui" 2017-06-17 00:00:00 +00:00
Luke Song e2bd876043 Introduce VR recovery ui
A version of screen ui with specific adjustments for vr device
compatibility.

(cherrypick of a44dba7f4e to AOSP)

Bug: 37779982
Test: "adb reboot recovery" to view
Change-Id: If6b0f26c1b587f8d0176060685b5efb6c67593b1
2017-06-16 15:33:02 -07:00
Luke Song 0f8b3710db Merge "Introduce VR recovery ui" 2017-06-16 19:30:53 +00:00
Chih-hung Hsieh 7f1b5ecd08 Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d am: 9f20e861b6 am: 80eb02dcbf
am: 14307c0c5f

Change-Id: I872e9aec11ebc60950edecf65c5e2f5ba894d5ff
2017-06-16 16:16:58 +00:00
Chih-hung Hsieh 14307c0c5f Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d am: 9f20e861b6
am: 80eb02dcbf

Change-Id: Id5ee47cf4f4537b041ce9313dc45c9ad1f498d7f
2017-06-16 16:13:28 +00:00
Chih-hung Hsieh 80eb02dcbf Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d
am: 9f20e861b6

Change-Id: If364b9bcb40126e8b892e2ac6ed1530f9959a1a6
2017-06-16 16:09:29 +00:00
Chih-hung Hsieh 9f20e861b6 Merge "Add OWNERS in bootable/recovery"
am: ffd8505f4d

Change-Id: I2675a929464997b106818afd4cf8a28b3b65f69c
2017-06-16 16:05:57 +00:00
Chih-hung Hsieh ffd8505f4d Merge "Add OWNERS in bootable/recovery" 2017-06-16 15:56:16 +00:00
Jeff Vander Stoep d2b09f1d90 Merge "Fix "No file_contexts" warning am: e35926e1af am: 3445b94c89" into oc-dr1-dev-plus-aosp
am: 2ea95442ed

Change-Id: I6ed6e51f75a28dc76977393b30c824a54b71553f
2017-06-16 03:05:17 +00:00
Jeff Vander Stoep 276f0cd1c7 Fix "No file_contexts" warning am: e35926e1af am: eba11fa574
am: 29476681cb

Change-Id: Ib8f7981adf3455af83ac28481bb109d9d924e900
2017-06-16 03:04:58 +00:00
Android Build Merger (Role) 2ea95442ed Merge "Fix "No file_contexts" warning am: e35926e1af am: 3445b94c89" into oc-dr1-dev-plus-aosp 2017-06-16 03:01:38 +00:00
Jeff Vander Stoep 29476681cb Fix "No file_contexts" warning am: e35926e1af
am: eba11fa574

Change-Id: I278bc4d7af6892ecf3c2d259f6d7fd32a34f19ec
2017-06-16 03:01:28 +00:00
Jeff Vander Stoep ce3f4dc513 Fix "No file_contexts" warning am: e35926e1af
am: 3445b94c89

Change-Id: I43f6596b266caff05e27c12ad1517e03e584d491
2017-06-16 03:01:28 +00:00
Jeff Vander Stoep 3445b94c89 Fix "No file_contexts" warning
am: e35926e1af

Change-Id: I32fdf32429d8574d901e94370bbc5a8db674542d
2017-06-16 02:58:00 +00:00
Jeff Vander Stoep eba11fa574 Fix "No file_contexts" warning
am: e35926e1af

Change-Id: Ia050561286c30d8198f3185da9e3cd31372b1d79
2017-06-16 02:57:57 +00:00
Jeff Vander Stoep e35926e1af Fix "No file_contexts" warning
Fixed by Loading the file_contexts specified in libselinux, whereas
previously recovery loaded /file_contexts which no longer exists.

Bug: 62587423
Test: build and flash recovery on Angler. Warning is gone.
Test: Wipe data and cache.
Test: sideload OTA
Change-Id: I11581c878b860ac5f412e6e8e7acde811f37870f
(cherry picked from commit 2330dd8733)
2017-06-15 21:24:29 +00:00
Chih-Hung Hsieh d6c49be5de Add OWNERS in bootable/recovery
* Owners are selected from top CL approvals or owners.
  They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
  https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/

Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: Ifb3f0a31389b2d55357fb6b8ea60c42dd790169d
2017-06-15 14:17:27 -07:00
Luke Song a44dba7f4e Introduce VR recovery ui
A version of screen ui with specific adjustments for vr device
compatibility.

Bug: 37779982
Test: "adb reboot recovery" to view
Change-Id: If6b0f26c1b587f8d0176060685b5efb6c67593b1
2017-06-15 10:57:26 -07:00
Jeff Vander Stoep 2330dd8733 Fix "No file_contexts" warning
Fixed by Loading the file_contexts specified in libselinux, whereas
previously recovery loaded /file_contexts which no longer exists.

Bug: 62587423
Test: build and flash recovery on Angler. Warning is gone.
Test: Wipe data and cache.
Test: sideload OTA
Change-Id: I11581c878b860ac5f412e6e8e7acde811f37870f
2017-06-14 16:10:50 -07:00
android-build-team Robot 19f7fe0d2e release-request-46bf7ca6-57e7-44b8-8edc-ea8830c1cb3b-for-git_oc-mr1-release-4090244 snap-temp-L07700000073092334
Change-Id: I32c94d2afb5516f4ababe71f97157eef4fa9a8c1
2017-06-11 07:37:32 +00:00
Dees Troy 92e2531dca Merge "Fix minui issues for some build trees" into android-7.1 2017-06-10 15:52:31 +02:00
Tianjie Xu e2cc5975b9 Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87 am: efa40b4827 am: 54138462b4
am: 327193d252

Change-Id: I20661bb18d6728abcaa9411805e81336c0832885
2017-06-09 01:09:03 +00:00
Tianjie Xu 327193d252 Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87 am: efa40b4827
am: 54138462b4

Change-Id: Id7c14730166326810d18283c3f1469446a4f71c6
2017-06-09 01:05:02 +00:00
Tianjie Xu 54138462b4 Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87
am: efa40b4827

Change-Id: Ie4c4bc3028fb41b49e5037ddca44680cf670c56a
2017-06-09 01:03:02 +00:00
Tianjie Xu efa40b4827 Merge "Fix a race condition for temperature_logger"
am: 8e5fb46e87

Change-Id: If62d4548b541432963a4d3d41f299d19927c72d6
2017-06-09 01:01:03 +00:00
Tianjie Xu 8e5fb46e87 Merge "Fix a race condition for temperature_logger" 2017-06-09 00:56:39 +00:00
Tianjie Xu 379571098d Fix a race condition for temperature_logger
It's a rare deadlock that happens on fugu when the updater exits too
fast due to a format error.

Bug: 62379170
Test: fake-ota fails gracefully without hanging.
Change-Id: Icbd6cff4f6b44ca20f4d75f8039332111f696cc5
2017-06-08 12:10:30 -07:00
big biff 52dc0ea4f9 Merge "ors: Update doc" into android-7.1 2017-06-08 02:08:45 +02:00
Pierre Roth e136fd495c Fix typos / inconsistencies in German language
Change-Id: Id3b4cca16ec18f63fb71f7e0ae09d2cc2d8516f8
2017-06-07 08:55:59 +02:00
Ethan Yonker 39662b2914 Fix minui issues for some build trees
In trees where TWRP is the primary recovery, minui.h was not setting rules
properly for healthd because healthd uses clang. Must use
CLANG_TARGET_GLOBAL_CFLAGS to set global flags.

Change-Id: I4cd9c88f8fcaec345fe012d09abcb9f24be06ef4
2017-06-06 11:32:50 -05:00
nailyk-fr 79605aece1 ors: Update doc
Change-Id: Ia026a8578262d4bb231e1727313ed1f5e323b880
2017-06-05 11:32:23 +02:00
nkk71 ffb02bdfc4 Improve decrypted partition logging
* Partition information should be updated after successful
  decryption (both userdata and adopted) and then logged

* Fix adopted storage nickname being ""

Change-Id: Idcdab84f339e932e62880089bad36e206920dd70
2017-06-04 23:15:05 +03:00
bigbiff bigbiff 4a2a1914a2 adbbackup: write smaller reads less than 512 bytes
This will allow the gzip compression header to be
written properly to the adb stream.

Thanks to nkk71 for finding the issue.
Change-Id: I3d88c5f575ca3fac904d8279f1f246994be2b02f
2017-06-04 04:30:09 +02:00
Ayke van Laethem 05c2de4c68 Fix various memory errors
There were a few memory errors while restoring a backup via adb (created
using `adb backup --twrp`).
On my device (S5 mini) it resulted in this error message:

  FORTIFY: strlen: prevented read past end of buffer

This commit fixes this issue and a few other potential issues.

Change-Id: I5022c94c961217238b3fefec0b2c4b8c6fa26ec7
2017-06-03 02:37:06 +02:00
android-build-team Robot aa794a9da4 release-request-fad05353-cc19-4c26-af2f-d5c8a574970e-for-git_oc-mr1-release-4057695 snap-temp-L92600000069427650
Change-Id: Ibf755c001c9fef5ec1faa303e7a2dc9950b816fa
2017-06-01 07:37:15 +00:00
Tianjie Xu 1905e3665a Merge "kill package_extract_dir" am: 99e7216907 am: 49f9c969eb am: 66e53f59b9
am: d1b65aa645

Change-Id: Idb46742fd2b73e927a14e12dd1b7ae5854e35334
2017-05-31 22:01:19 +00:00
Tianjie Xu d1b65aa645 Merge "kill package_extract_dir" am: 99e7216907 am: 49f9c969eb
am: 66e53f59b9

Change-Id: Iec9ae5171aaa2d8a0eb92de12b78e65aeb0136a4
2017-05-31 21:59:21 +00:00