Commit Graph

4746 Commits

Author SHA1 Message Date
Tao Bao e793b3c880 Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6 am: 076aba3d8a am: a6aa96f3fd
am: 43a866cbe6

Change-Id: I430963a4ad3c9aea4cd3a1530c419a009dd09dcc
2017-06-27 19:23:18 +00:00
Tao Bao 43a866cbe6 Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6 am: 076aba3d8a
am: a6aa96f3fd

Change-Id: I08d87ae7eed266f1b755b6bfe94699e64d474ab2
2017-06-27 19:11:48 +00:00
Tao Bao a6aa96f3fd Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6
am: 076aba3d8a

Change-Id: I6a16dab86d41026f7a2501a3ee7601ae97c5dd72
2017-06-27 19:09:18 +00:00
Tao Bao 076aba3d8a Merge "Formatting RecoveryUI related files."
am: 8e7db8f4a6

Change-Id: I81e0e1e088da045f217aff957c7c5730d09cabbe
2017-06-27 19:06:17 +00:00
Treehugger Robot 8e7db8f4a6 Merge "Formatting RecoveryUI related files." 2017-06-27 19:00:48 +00:00
Tianjie Xu 97f1848c0c Merge "avoid assuming build number is a 32-bit integer" am: 30afdee987 am: 170aa1c923 am: 09b438052e
am: 312c30c4f7

Change-Id: I683bfd5fd505435b096ccfe871388d628264593f
2017-06-27 00:51:44 +00:00
Tianjie Xu 312c30c4f7 Merge "avoid assuming build number is a 32-bit integer" am: 30afdee987 am: 170aa1c923
am: 09b438052e

Change-Id: I56e26389c5959eaa0b8d734515fbbe5dc4b414c0
2017-06-26 22:03:46 +00:00
Tianjie Xu 09b438052e Merge "avoid assuming build number is a 32-bit integer" am: 30afdee987
am: 170aa1c923

Change-Id: Ia11eec1dc9c1b484f7f5cd67ff1792b5c3423a26
2017-06-26 22:01:18 +00:00
Tianjie Xu 170aa1c923 Merge "avoid assuming build number is a 32-bit integer"
am: 30afdee987

Change-Id: Ibe47feaf6d00838db24b76a51e2418772f329e0d
2017-06-26 21:56:49 +00:00
Tianjie Xu 30afdee987 Merge "avoid assuming build number is a 32-bit integer" 2017-06-26 21:12:09 +00:00
Daniel Micay a29d8d69d2 avoid assuming build number is a 32-bit integer
The install logging currently assumes that the build number is a 32-bit
integer and prints an error when that doesn't hold true. However, that's
only a convention used by Google builds.

From build/core/version_defaults.mk:

    ifeq "" "$(BUILD_NUMBER)"
      # BUILD_NUMBER should be set to the source control value that
      # represents the current state of the source code.  E.g., a
      # perforce changelist number or a git hash.  Can be an arbitrary string
      # (to allow for source control that uses something other than numbers),
      # but must be a single word and a valid file name.
      #
      # If no BUILD_NUMBER is set, create a useful "I am an engineering build
      # from this date/time" value.  Make it start with a non-digit so that
      # anyone trying to parse it as an integer will probably get "0".
      BUILD_NUMBER := eng.$(shell echo $${USER:0:6}).$(shell $(DATE) +%Y%m%d.%H%M%S)
    endif

Change-Id: I8e7cec0618783f69545ba76d0dce2bbc1681784c
2017-06-26 10:53:03 -04:00
Tao Bao 5d2e3bd109 Formatting RecoveryUI related files.
All cosmetic changes about indentation reformatting in this CL.

Test: mmma bootable/recovery
Change-Id: I4539e6244697d1f356b7eb10b961b52d7db561f7
2017-06-23 23:05:56 -07:00
Luke Song 27013b1aca Merge "Restructure vr_ui" am: 20d40ce53a am: 674851dc86 am: 799cd0bb5d
am: cb12f9040f

Change-Id: I75d2427b51373c7775b77bc29a4ebf88498d9247
2017-06-24 01:34:59 +00:00
Luke Song cb12f9040f Merge "Restructure vr_ui" am: 20d40ce53a am: 674851dc86
am: 799cd0bb5d

Change-Id: I388afaf0bd66c0ad9344b10bfc61e918838a9d5a
2017-06-24 01:29:59 +00:00
Luke Song 799cd0bb5d Merge "Restructure vr_ui" am: 20d40ce53a
am: 674851dc86

Change-Id: Ie94f4e605713dc9bb4a4e312edadc1e8120d860d
2017-06-24 01:24:29 +00:00
Luke Song 674851dc86 Merge "Restructure vr_ui"
am: 20d40ce53a

Change-Id: I83efb71cf8d36be932660645a36191be0f12ddc7
2017-06-24 01:19:28 +00:00
Treehugger Robot 20d40ce53a Merge "Restructure vr_ui" 2017-06-24 01:11:04 +00:00
Luke Song 9d4839c60f Restructure vr_ui
Get rid of pixel offset variables, and use makefile variables in
BoardConfigs.

Bug: 37779982
Test: Verified vr ui has same behavior.
Change-Id: Ifbf44e27d7101aedbe3c0e6db4b8181d56efadfd
(cherry picked from commit 81a8e4cab2)
2017-06-23 16:51:00 -07:00
Luke Song cffd5e58cf Merge "Restructure vr_ui" 2017-06-23 23:34:33 +00:00
Tao Bao a5172224a5 Use Makefile variables to specify margin settings. am: 855eaffff6 -s ours
am: 989385200f

Change-Id: I0bec043db9e23cb7c47ed2929b906e42561eacef
2017-06-23 22:46:48 +00:00
Tao Bao 781ba1f1ad screen_ui: Allow setting screen margin space. am: 8f7547edfa -s ours
am: 2abdb8d6e7

Change-Id: I0b2f63adc3b06b4ee72093821f31d76e6ccc82ef
2017-06-23 22:46:46 +00:00
Tao Bao 989385200f Use Makefile variables to specify margin settings.
am: 855eaffff6  -s ours

Change-Id: I25a554cd60a9e08d954180792c2b3d0931fe2400
2017-06-23 22:41:49 +00:00
Tao Bao 2abdb8d6e7 screen_ui: Allow setting screen margin space.
am: 8f7547edfa  -s ours

Change-Id: Ie480acb2efab18ec32c4964914457aac4f34e74e
2017-06-23 22:41:46 +00:00
Tao Bao 8226cd3906 Merge changes Icb6f7466,Ibf6238c9 am: eef231567c am: d1fa3c2380 am: 2eb2c0b276
am: 10ffcd12e9

Change-Id: I5286296ee5f9ea19fe2b3184db21c3b734a8a565
2017-06-23 22:07:00 +00:00
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
Luke Song 81a8e4cab2 Restructure vr_ui
Get rid of pixel offset variables, and use makefile variables in
BoardConfigs.

Bug: 37779982
Test: Verified vr ui has same behavior.
Change-Id: Ifbf44e27d7101aedbe3c0e6db4b8181d56efadfd
2017-06-23 14:33:46 -07:00
Tao Bao 855eaffff6 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:45:28 -07:00
Tao Bao 8f7547edfa 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
(cherry picked from commit 87f4650874)
2017-06-23 09:45:23 -07: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
Tao Bao d9bc424960 Merge changes from topic 'recovery_ui_taimen'
* changes:
  Use Makefile variables to specify margin settings.
  screen_ui: Allow setting screen margin space.
2017-06-23 16:19:55 +00:00
Tianjie Xu 203544605e Merge "Remove the obsolete package_extract_dir() test" am: e916cca8a9 am: af913974a5 am: e002d96194
am: 617b702104

Change-Id: If64f4217fbdbfc849c851a2b94d306cf1755e65d
2017-06-23 05:02:27 +00: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 3cd634d311 update_verifier: Support AVB. am: 336cbce252 -s ours
am: eb0dfc0dc6  -s ours

Change-Id: I0e3bae1447fee7441daf6e5d3a2e3dcfa64f7775
2017-06-23 00:26:35 +00: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 d0f330026f Merge "update_verifier: Support AVB." am: e248e434ea am: 1f108dae49 am: b0c38f1cce
am: 0f6a109f14

Change-Id: I8bcac1f9bbb2a84055708a74237ea6f3c60be21c
2017-06-22 20:03:54 +00: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
Tao Bao a92d8fb456 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
2017-06-22 12:40:22 -07: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
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