Commit Graph

2660 Commits

Author SHA1 Message Date
Tao Bao 70ff92894e Merge \\"recovery: Track the name change for wipe_ab.\\" into nyc-mr1-dev am: dc1393d09b
am: 0146b37256

Change-Id: Idfea28dc1824394b60ea5c9ddb8ee77834c2d86a
2016-06-13 16:54:14 +00:00
Tao Bao 0146b37256 Merge \"recovery: Track the name change for wipe_ab.\" into nyc-mr1-dev
am: dc1393d09b

Change-Id: I7ec8d93bb41d0bd7f921fbb97c5b8639798e3bec
2016-06-13 16:50:43 +00:00
Tao Bao dc1393d09b Merge "recovery: Track the name change for wipe_ab." into nyc-mr1-dev 2016-06-13 16:43:46 +00:00
Tao Bao 2a069a9dfd Merge \\\\"updater: Fix the broken ReadFileFn.\\\\" am: 4ddd5edf31 am: 89dfe730d4 am: 1e67422f37
am: d241c85cd0

Change-Id: Id5d0de845b101668ff30d19cc257d78e0575e58d
2016-06-11 19:00:54 +00:00
Tao Bao d241c85cd0 Merge \\\"updater: Fix the broken ReadFileFn.\\\" am: 4ddd5edf31 am: 89dfe730d4
am: 1e67422f37

Change-Id: I3beade52bfaeea0e84055d007d82ff2ef5c07dbb
2016-06-11 18:57:05 +00:00
Tao Bao 1e67422f37 Merge \\"updater: Fix the broken ReadFileFn.\\" am: 4ddd5edf31
am: 89dfe730d4

Change-Id: Ia465c92d341da4681d3490151a20e1e117271e52
2016-06-11 18:53:14 +00:00
Tao Bao 89dfe730d4 Merge \"updater: Fix the broken ReadFileFn.\"
am: 4ddd5edf31

Change-Id: Id73ccb86a3869198baf84b7978054b174c281c79
2016-06-11 18:49:21 +00:00
Tao Bao 4ddd5edf31 Merge "updater: Fix the broken ReadFileFn." 2016-06-11 18:42:53 +00:00
Tao Bao efacd80364 updater: Fix the broken ReadFileFn.
Was accidentally broken by the CL in [1].

[1]: commit d6c93afcc2

Change-Id: I851e13ccea6f5be6fcd47f712cc95867245f9934
2016-06-11 03:59:56 -07:00
Tianjie Xu 4bc65fdac4 Log source/target build version to last_install am: b0ddae55e5 am: dcf1089771
am: d8f519607c

Change-Id: I1be3af313d27eb87b7c1864ba6e657b196a8c04b
2016-06-10 17:32:59 +00:00
Tianjie Xu d8f519607c Log source/target build version to last_install am: b0ddae55e5
am: dcf1089771

Change-Id: Iec992f05f0721b4509d996bbacdbcb7cdd397e5c
2016-06-10 17:31:09 +00:00
Tianjie Xu 1d8ac5f090 Log source/target build version to last_install am: b0ddae55e5 am: 9d2657fbb7
am: 32027d8438

Change-Id: I8691365a80aaa9cf2c138dcaae005970dba44a1b
2016-06-10 17:27:38 +00:00
Tianjie Xu 32027d8438 Log source/target build version to last_install am: b0ddae55e5
am: 9d2657fbb7

Change-Id: I3bb89e59b0e21d415fa1b5681f08803ffd787169
2016-06-10 17:24:50 +00:00
Tianjie Xu dcf1089771 Log source/target build version to last_install
am: b0ddae55e5

Change-Id: I8be36165769d4159e4578f9fea54f332e4e77c6c
2016-06-10 17:21:40 +00:00
Tianjie Xu 9d2657fbb7 Log source/target build version to last_install
am: b0ddae55e5

Change-Id: Ifd9e006588de8bea233a4e90a5c80ed6b894054a
2016-06-10 17:21:40 +00:00
Tao Bao 108ab21b21 recovery: Track the name change for wipe_ab.
Bug: 27253717
Change-Id: I6e63b2a80b7b2948c16e1b57dedc856d52456ac9
2016-06-10 10:13:32 -07:00
Elliott Hughes 40d856b89e Merge \\\\"Remove etc/META-INF/com/google/android/update-script.\\\\" am: 5b2191a9d6 am: 5be6ae12b5 am: 21c4f4e6e6
am: fc29db992a

Change-Id: I9e530f8a40c600fe00c2bff26dbe99c5d07bb195
2016-06-10 16:36:01 +00:00
Elliott Hughes fc29db992a Merge \\\"Remove etc/META-INF/com/google/android/update-script.\\\" am: 5b2191a9d6 am: 5be6ae12b5
am: 21c4f4e6e6

Change-Id: I62527d8d5217384c1524090da3428fea31d03615
2016-06-10 16:33:17 +00:00
Elliott Hughes 21c4f4e6e6 Merge \\"Remove etc/META-INF/com/google/android/update-script.\\" am: 5b2191a9d6
am: 5be6ae12b5

Change-Id: Ia2aace34275d4ef517b0bf47a8c9ae04f47a3f05
2016-06-10 16:30:34 +00:00
Elliott Hughes 5be6ae12b5 Merge \"Remove etc/META-INF/com/google/android/update-script.\"
am: 5b2191a9d6

Change-Id: Ie27f4c9d78de710eb45a87fed9c0aaf6b71404b6
2016-06-10 16:27:49 +00:00
Elliott Hughes 5b2191a9d6 Merge "Remove etc/META-INF/com/google/android/update-script." 2016-06-10 16:20:42 +00:00
Elliott Hughes ad29b10c00 Remove etc/META-INF/com/google/android/update-script.
Bug: http://b/29250988
Change-Id: I61f8c6717b38de2242e4ea8e0913237c1ce5bfea
2016-06-09 18:03:05 -07:00
Tianjie Xu b0ddae55e5 Log source/target build version to last_install
Parse the build.version.incremental from the metadata of the update
package; and log it to last_install.
Example:
In metadata we read:
post-build-incremental=2951741
pre-build-incremental=2943039

In last install we log:
source_build: 2943039
target_build: 2951741

Bug: 28658632
Change-Id: I0a9cc2d01644846e18bda31f4193ff40e8924486
2016-06-09 17:29:04 -07:00
Alain Vongsouvanh 41840b6e0c Merge \"resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 91d78acbd3\" into nyc-mr1-dev-plus-aosp
am: ab380fd77d

Change-Id: I7c96593906f26e71eae8760e3f474ac2e8115f38
2016-06-08 15:56:46 +00:00
Alain Vongsouvanh ae3269accd resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 2a697feb39
am: 61da13a57f

Change-Id: I38702eb8b5e7a8455cc2a531e5c0fffaa4d955cc
2016-06-08 15:56:46 +00:00
Android Build Merger (Role) ab380fd77d Merge "resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 91d78acbd3" into nyc-mr1-dev-plus-aosp 2016-06-08 15:52:05 +00:00
Alain Vongsouvanh 61da13a57f resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9
am: 2a697feb39

Change-Id: Id1dcd42164121b4c31089c47fb56fb317da19896
2016-06-08 15:51:48 +00:00
Alain Vongsouvanh aec20552a4 resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9
am: 91d78acbd3

Change-Id: Ib2c1caa0a5f43d708634aaa69b8b1a9fc094edeb
2016-06-08 15:51:48 +00:00
Alain Vongsouvanh 91d78acbd3 resolve merge conflicts of 6aa6ddb to nyc-dev
am: 771b6eb8d9

Change-Id: Icc7290bbdf7b7420bab34b56f4e368f93b007053
2016-06-08 15:46:40 +00:00
Alain Vongsouvanh 2a697feb39 resolve merge conflicts of 6aa6ddb to nyc-dev
am: 771b6eb8d9

Change-Id: Ie0dabf5fb0930b75117193ae31e73df62d885903
2016-06-08 15:46:40 +00:00
Alain Vongsouvanh 771b6eb8d9 resolve merge conflicts of 6aa6ddb to nyc-dev
Change-Id: I3696fe3e86e0222c7c26b0aa2bf1dd8e03ac5315
2016-06-08 08:30:48 -07:00
Alain Vongsouvanh 6aa6ddb3c5 recovery: Make wear recovery more customizable.
am: 5b00110e3d

Change-Id: I88ab75e875cea8813ab4bdc9f099c31609ace6fd
2016-06-08 15:10:54 +00:00
Alain Vongsouvanh 5b00110e3d recovery: Make wear recovery more customizable.
Making animation_fps protected and adding support for 0 frames intro.

BUG: 29085786
Change-Id: I07b44570022bad89661973178d453592c01f3f10
2016-06-07 10:05:29 -07:00
Tao Bao ab1eed7f6f resolve merge conflicts of 1afa4d7 to nyc-mr1-dev-plus-aosp
am: df956eceef

* commit 'df956eceefb6bf7addc0057572741237cacdfa12':
  recovery: Add support to brick a device.

Change-Id: Ib918b66e3ba07f09da34781cc36307acac0a23e7
2016-06-04 04:33:19 +00:00
Tao Bao df956eceef resolve merge conflicts of 1afa4d7 to nyc-mr1-dev-plus-aosp
Change-Id: I8fca64ebdbafe27f02d359619aa60ab82618114a
2016-06-03 21:26:19 -07:00
Tao Bao 1afa4d7b23 Merge "recovery: Add support to brick a device." into nyc-mr1-dev 2016-06-04 04:19:05 +00:00
Tianjie Xu 8e7a862eac resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp am: 64f46fb16c
am: 3295d1993a

* commit '3295d1993a1ddbfe17c5d5750f2ca975359662b2':

Change-Id: Id26f893567cdb867322de9f745aaf78510e2cd5c
2016-06-04 00:19:08 +00:00
Tianjie Xu 3295d1993a resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp
am: 64f46fb16c

* commit '64f46fb16ccae69f7a826585c5eaba48fe1b05da':

Change-Id: I2385636728c2d1f874d8c8b72f38237b2f8d5be9
2016-06-03 23:29:25 +00:00
Tianjie Xu cf5c1bc87d resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aosp
am: 894176632c

* commit '894176632c7295875d01cfdc273b706996c483a4':
  Call ioctl before each write on retry

Change-Id: I814e7c9409d94aed8733a9e1fc562394f8da1e76
2016-06-03 23:07:58 +00:00
Tianjie Xu 894176632c resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aosp
Change-Id: I98502950a0882050f5ed1acb0549b218b2cd06e4
2016-06-03 16:01:28 -07:00
Tao Bao f02e7996e0 resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp am: ba33da2884
am: 8dc1909901

* commit '8dc190990154e8fff483084e4b44a1fdce507f0f':
  recovery: Add support to brick a device.

Change-Id: I314215e1230d0167b27602c387df517e244b7455
2016-06-03 22:58:04 +00:00
Tao Bao 8dc1909901 resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp
am: ba33da2884

* commit 'ba33da288418387234637c6806e103936530cb53':
  recovery: Add support to brick a device.

Change-Id: I44c667f8eb0d003a9cc84ea457f91b44263af7df
2016-06-03 22:55:14 +00:00
Tianjie Xu 64f46fb16c resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp
Change-Id: I2194d1170281f58eb508f2ef63b39c8729125f76
2016-06-03 15:44:52 -07:00
Tianjie Xu 57ad046d9d Call ioctl before each write on retry
am: 7ce287d432

* commit '7ce287d432dd3a4dc8841fc59e11ee1a0b7808a1':
  Call ioctl before each write on retry

Change-Id: Iae05ceca190c253d0be3ae9e4054abf4d0dbe751
2016-06-03 22:38:11 +00:00
Tao Bao ba33da2884 resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp
Change-Id: I18ecc333a76860405028b90b0baf2fba78d3942e
2016-06-03 14:57:34 -07:00
Tao Bao fe8e356b7d Merge "recovery: Add support to brick a device."
am: 0ab866b354

* commit '0ab866b3544ff999293b2c296908e969d72b5799':
  recovery: Add support to brick a device.

Change-Id: I4a106a6780b48f32d2776a436cc6445b3746fcc0
2016-06-03 21:51:13 +00:00
Tao Bao b083818612 recovery: Add support to brick a device.
When recovery starts with --brick, it tries to brick the device by
securely wiping all the partitions as listed in /etc/recovery.brick.

This is designed to support bricking lost devices.

Bug: 27253717
Change-Id: Ib0bd4f0a3bdaca4febc91fce6b682e3ec74354e2
(cherry picked from commit 862a4c1119)
2016-06-03 14:43:05 -07:00
Tao Bao 0ab866b354 Merge "recovery: Add support to brick a device." 2016-06-03 21:35:06 +00:00
Tianjie Xu 7ce287d432 Call ioctl before each write on retry
If the update is a retry, ioctl(BLKDISCARD) the destination blocks before
writing to these blocks.

Bug: 28990135
Change-Id: I1e703808e68ebb1292cd66afd76be8fd6946ee59
2016-06-03 12:12:50 -07:00
Tao Bao 862a4c1119 recovery: Add support to brick a device.
When recovery starts with --brick, it tries to brick the device by
securely wiping all the partitions as listed in /etc/recovery.brick.

This is designed to support bricking lost devices.

Bug: 27253717
Change-Id: Ib0bd4f0a3bdaca4febc91fce6b682e3ec74354e2
2016-06-03 11:01:41 -07:00