PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,159 Commits 1 Branch 0 Tags
deaf2662d7ba0ee4672d5cc2a4ff7a50108e8079
Commit Graph
7159 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughesandandroid-build-merger 39c6051c1e Merge "Add missing libziparchive dependency." am: f9fe6a705d am: 78ff0832cb am: 8b4c7e7567 
am: 171642fac5

Change-Id: I63a77f7ba32a624f73d0324483f4c747407b9266
 2017-06-28 16:51:40 +00:00
Elliott Hughesandandroid-build-merger 171642fac5 Merge "Add missing libziparchive dependency." am: f9fe6a705d am: 78ff0832cb 
am: 8b4c7e7567

Change-Id: Id1a0722d51b5f8142b87112f0b32e6162892c199
 2017-06-28 16:48:10 +00:00
Elliott Hughesandandroid-build-merger 8b4c7e7567 Merge "Add missing libziparchive dependency." am: f9fe6a705d 
am: 78ff0832cb

Change-Id: I57e2b9a4e42e3e32e5f3d4ca550ea59898abbff1
 2017-06-28 16:44:40 +00:00
Elliott Hughesandandroid-build-merger 78ff0832cb Merge "Add missing libziparchive dependency." 
am: f9fe6a705d

Change-Id: Iface325955657b6c8f72d19fbbe7b8e475a15fbb
 2017-06-28 16:41:12 +00:00
Treehugger RobotandGerrit Code Review f9fe6a705d Merge "Add missing libziparchive dependency." 2017-06-28 16:35:39 +00:00
Elliott Hughes e1bb7a5752 Add missing libziparchive dependency. 
Bug: http://b/37560614
Test: builds even after removing system/core/include/ziparchive
Change-Id: Ib7ed45cafe83d24ed55aac28b4f41a073c371bc2
 2017-06-28 08:00:17 -07:00
Tao Baoandandroid-build-merger 46d4eb571d Merge "Add override specifier and member constness to RecoveryUI classes." am: d6fb1c6367 am: 2e20c11828 am: 57191920e8 
am: 8e4ddcce97

Change-Id: I46ee95ae8d3a1ef7ae6ba76b8125ed2774b1d510
 2017-06-27 22:48:02 +00:00
Tao Baoandandroid-build-merger 8e4ddcce97 Merge "Add override specifier and member constness to RecoveryUI classes." am: d6fb1c6367 am: 2e20c11828 
am: 57191920e8

Change-Id: I8320f696ca21b14564a3fa38937fdf090eeff4f7
 2017-06-27 22:41:33 +00:00
Tao Baoandandroid-build-merger 57191920e8 Merge "Add override specifier and member constness to RecoveryUI classes." am: d6fb1c6367 
am: 2e20c11828

Change-Id: Ib467bf7ae8a7a581617cdd124c3803a5aa631031
 2017-06-27 22:38:34 +00:00
Tao Baoandandroid-build-merger 2e20c11828 Merge "Add override specifier and member constness to RecoveryUI classes." 
am: d6fb1c6367

Change-Id: I9b012c3096563e3c0187f644ed4fa930e785c502
 2017-06-27 22:35:32 +00:00
Tao BaoandGerrit Code Review d6fb1c6367 Merge "Add override specifier and member constness to RecoveryUI classes." 2017-06-27 22:29:36 +00:00
Tao Baoandandroid-build-merger 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 Baoandandroid-build-merger 43a866cbe6 Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6 am: 076aba3d8a 
am: a6aa96f3fd

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

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

Change-Id: I81e0e1e088da045f217aff957c7c5730d09cabbe
 2017-06-27 19:06:17 +00:00
Treehugger RobotandGerrit Code Review 8e7db8f4a6 Merge "Formatting RecoveryUI related files." 2017-06-27 19:00:48 +00:00
Tianjie Xuandandroid-build-merger 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
Jin Qian 619b162d67 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
Merged-In: I10a9f4c1f4754ad864b2df45b1f879180ab33876
 2017-06-27 00:34:43 +00:00
Tianjie Xuandandroid-build-merger 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 Xuandandroid-build-merger 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 Xuandandroid-build-merger 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 XuandGerrit Code Review 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 99b2d77475 Add override specifier and member constness to RecoveryUI classes. 
Test: mmma bootable/recovery
Change-Id: I66e328614423488a4027d7878f4569fbf3a3721e
 2017-06-23 23:06:01 -07: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 Songandandroid-build-merger 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 Songandandroid-build-merger cb12f9040f Merge "Restructure vr_ui" am: 20d40ce53a am: 674851dc86 
am: 799cd0bb5d

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

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

Change-Id: I83efb71cf8d36be932660645a36191be0f12ddc7
 2017-06-24 01:19:28 +00:00
Treehugger RobotandGerrit Code Review 20d40ce53a Merge "Restructure vr_ui" 2017-06-24 01:11:04 +00:00
Luke SongandTao Bao 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 SongandAndroid (Google) Code Review cffd5e58cf Merge "Restructure vr_ui" 2017-06-23 23:34:33 +00:00
Tao Baoandandroid-build-merger 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 Baoandandroid-build-merger 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 Baoandandroid-build-merger 989385200f Use Makefile variables to specify margin settings. 
am: 855eaffff6  -s ours

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

Change-Id: Ie480acb2efab18ec32c4964914457aac4f34e74e
 2017-06-23 22:41:46 +00:00
Tao Baoandandroid-build-merger 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 Baoandandroid-build-merger 10ffcd12e9 Merge changes Icb6f7466,Ibf6238c9 am: eef231567c am: d1fa3c2380 
am: 2eb2c0b276

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

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

Change-Id: I02789095a2bfec89803f7484abc072d05d8b0148
 2017-06-23 21:52:14 +00:00
Tao BaoandGerrit Code Review 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 BaoandAndroid (Google) Code Review 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 Xuandandroid-build-merger 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 Xuandandroid-build-merger 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 Xuandandroid-build-merger 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 Xuandandroid-build-merger af913974a5 Merge "Remove the obsolete package_extract_dir() test" 
am: e916cca8a9

Change-Id: If43bfd9b134a1b2630e5ad906770c6f9516c494d
 2017-06-23 04:49:56 +00:00