Commit Graph

4704 Commits

Author SHA1 Message Date
Tao Bao 10ffcd12e9 Merge changes Icb6f7466,Ibf6238c9 am: eef231567c am: d1fa3c2380
am: 2eb2c0b276

Change-Id: I228c3ccfa659b1d81e841eb66b9e446d665dd8ce
2017-06-23 22:01:44 +00:00
Tao Bao 2eb2c0b276 Merge changes Icb6f7466,Ibf6238c9 am: eef231567c
am: d1fa3c2380

Change-Id: Ib7e71dd067f73367b3461de613e63e476ad8f1de
2017-06-23 21:56:44 +00:00
Tao Bao d1fa3c2380 Merge changes Icb6f7466,Ibf6238c9
am: eef231567c

Change-Id: I02789095a2bfec89803f7484abc072d05d8b0148
2017-06-23 21:52:14 +00:00
Tao Bao eef231567c Merge changes Icb6f7466,Ibf6238c9
* changes:
  Use Makefile variables to specify margin settings.
  screen_ui: Allow setting screen margin space.
2017-06-23 21:44:01 +00:00
Tao Bao 4521b7027f Use Makefile variables to specify margin settings.
Instead of defining device-specific UI class, this CL allows using
Makefile variables to specify margin values directly.

Values explicitly defined via TARGET_RECOVERY_UI_MARGIN_HEIGHT and
TARGET_RECOVERY_UI_MARGIN_WIDTH will be used. Otherwise they will
default to zero.

Bug: 62732748
Test: Specify the height and width and check recovery texts.
Change-Id: Icb6f7466c8d407f877b93da38aebfdf7e6b41be7
(cherry picked from commit a92d8fb456)
2017-06-23 09:22:34 -07:00
Tianjie Xu 617b702104 Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9 am: af913974a5
am: e002d96194

Change-Id: If4887683362c1a00ee20b0d6e447d70bff442c28
2017-06-23 04:58:26 +00:00
Tianjie Xu e002d96194 Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9
am: af913974a5

Change-Id: I6afcdb92726231325a7d2e8171e3e2b1b3b940e0
2017-06-23 04:53:56 +00:00
Tianjie Xu af913974a5 Merge "Remove the obsolete package_extract_dir() test"
am: e916cca8a9

Change-Id: If43bfd9b134a1b2630e5ad906770c6f9516c494d
2017-06-23 04:49:56 +00:00
Tianjie Xu e916cca8a9 Merge "Remove the obsolete package_extract_dir() test" 2017-06-23 04:46:14 +00:00
Tianjie Xu bb7e005a79 Remove the obsolete package_extract_dir() test
package_extract_dir() was removed in go/aog/402383, and the
corresponding UpdaterTest should be removed as well.

Bug: 62918308
Test: mma && code search
Change-Id: Ibe9c473a5d41d2fa4d26abca5684e71b104891b0
2017-06-22 17:35:06 -07:00
David Zeuthen eb0dfc0dc6 update_verifier: Support AVB.
am: 336cbce252  -s ours

Change-Id: I3907377b5896f9b859703a5acad47486bd17a52d
2017-06-23 00:22:05 +00:00
David Zeuthen 336cbce252 update_verifier: Support AVB.
When using AVB, PRODUCT_SUPPORTS_VERITY is not set so check for
BOARD_ENABLE_AVB as well. Also AVB sets up the root filesystem as
'vroot' so map that to 'system' since this is what is
expected. Managed to test at least that the code is at least compiled
in:

 $ fastboot --set-active=_a
 Setting current slot to 'a'...
 OKAY [  0.023s]
 finished. total time: 0.023s

 $ fastboot reboot
 rebooting...

 finished. total time: 0.050s

 $ adb wait-for-device

 $ adb logcat |grep update_verifier
 03-04 05:28:56.773   630   630 I /system/bin/update_verifier: Started with arg 1: nonencrypted
 03-04 05:28:56.776   630   630 I /system/bin/update_verifier: Booting slot 0: isSlotMarkedSuccessful=0
 03-04 05:28:56.776   630   630 W /system/bin/update_verifier: Failed to open /data/ota_package/care_map.txt: No such file or directory
 03-04 05:28:56.788   630   630 I /system/bin/update_verifier: Marked slot 0 as booted successfully.
 03-04 05:28:56.788   630   630 I /system/bin/update_verifier: Leaving update_verifier.

Bug: 62464819
Test: Manually tested on device using AVB bootloader.
Merged-In: I13c0fe1cc5d0f397e36f5e62fcc05c8dfee5fd85
Change-Id: I2834b17688053411e7b904e31df9c83bf904cd56
2017-06-22 18:04:26 -04:00
David Zeuthen 0f6a109f14 Merge "update_verifier: Support AVB." am: e248e434ea am: 1f108dae49
am: b0c38f1cce

Change-Id: If4e8be8b8277143cad9447a487a674e39ba5a832
2017-06-22 19:56:37 +00:00
David Zeuthen b0c38f1cce Merge "update_verifier: Support AVB." am: e248e434ea
am: 1f108dae49

Change-Id: I85544f829783fade5e91cfa1d48013047056924d
2017-06-22 19:26:10 +00:00
David Zeuthen 1f108dae49 Merge "update_verifier: Support AVB."
am: e248e434ea

Change-Id: Ia17522bce3427eb29fc0e8860ea6e05749047d49
2017-06-22 19:22:11 +00:00
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
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
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
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
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
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
Tianjie Xu 66e53f59b9 Merge "kill package_extract_dir" am: 99e7216907
am: 49f9c969eb

Change-Id: If8936fb2b090b83ad6fba39668d60e324662a42e
2017-05-31 21:57:18 +00:00
Tianjie Xu 49f9c969eb Merge "kill package_extract_dir"
am: 99e7216907

Change-Id: Ibc08736b0108151a4a023d971bd608654138d45e
2017-05-31 21:54:18 +00:00
Tianjie Xu 99e7216907 Merge "kill package_extract_dir" 2017-05-31 21:49:03 +00:00
Tianjie Xu 177076fcd5 Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088a am: 4a2cfffd33
am: d38aec8de6

Change-Id: Ibdb1b48633736802bff664973fcd4c08dc9ac93a
2017-05-26 23:32:43 +00:00
Tianjie Xu d38aec8de6 Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088a
am: 4a2cfffd33

Change-Id: Ifd32f346adefb90d043bccc3d6f20060ae3ca45d
2017-05-26 23:20:07 +00:00
Tianjie Xu 4a2cfffd33 Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af
am: 0f8e67088a

Change-Id: I8e7499d97f6acb505e42b9935d3b21a41695dba7
2017-05-26 23:15:36 +00:00
Tianjie Xu 0f8e67088a Merge "Implement a custom deflate sink function for bspatch"
am: 764eb215af

Change-Id: Ifac391f38d692a5312b4b03ff5eaf701da6d7d41
2017-05-26 23:13:36 +00:00
Tianjie Xu 764eb215af Merge "Implement a custom deflate sink function for bspatch" 2017-05-26 23:07:13 +00:00
Tianjie Xu a897f95bd5 Implement a custom deflate sink function for bspatch
This new sink function works as a wrapper of the old sink. It deflates
the available patch data on the fly. Therefore, we don't need to store
the full uncompressed patch data in memory.

Test: recovery_component_test && apply an incremental update on angler
Change-Id: I2274ec50a1607089abcc9d0954a2a748f28c3122
2017-05-26 14:05:20 -07:00
Tianjie Xu 75dee9b064 Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 am: 66f02b4e71 am: aef046255a
am: da1fcf7ab2

Change-Id: Icad68a225061426e396541d0f67374a530f1dcb3
2017-05-24 18:56:34 +00:00