PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,727 Commits 1 Branch 0 Tags
54881abb52151ab9a4340e268c81fd3e644e9018
Commit Graph
2727 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Bouyack 54881abb52 Revert "DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067" 
This reverts commit 78563fdf78.

Change-Id: I1ea4956a9843130aa41f2f7bc011c72e64fd7b62
 2016-09-20 22:57:19 +00:00
Matthew Bouyack 78563fdf78 DO NOT MERGE Fail gracefully when we fail to fork the update binary 
am: de1b53d067

Change-Id: Ic7a42220ed7e842dad1d5d2aacdd12253bd5ad84
 2016-09-20 21:24:51 +00:00
Matthew Bouyack de1b53d067 DO NOT MERGE Fail gracefully when we fail to fork the update binary 
See bug b/31395655

Change-Id: Ic5a046bc80ea88d7eb52755838bdbf4e1e47da50
 2016-09-20 11:32:17 -07:00
Tianjie Xu cc94f81436 Check corruption when reading uncrypt_status file am: 41a3fd4e20 
am: 914f39d2d3

Change-Id: Ie8056fe4dfccfd44e740f6f3ba4621fbc8f5142b
 2016-09-13 22:48:34 +00:00
Tianjie Xu 914f39d2d3 Check corruption when reading uncrypt_status file 
am: 41a3fd4e20

Change-Id: I19d9b6605d75d636eef0c770979b9f71c2e6a7f2
 2016-09-13 22:45:34 +00:00
Tianjie Xu 8dd5b2a2cc Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 am: 40bae5e1c6 
am: 1d55666106

Change-Id: I2081d6803377a7bf26175a55b3b5defb7c9d09d1
 2016-09-13 22:31:33 +00:00
Tianjie Xu 1d55666106 Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 
am: 40bae5e1c6

Change-Id: I098148f53065e7420e500db66f1ada0d0730a0d6
 2016-09-13 22:28:32 +00:00
Tianjie Xu 40bae5e1c6 Merge "Check corruption when reading uncrypt_status file" 
am: 3cf815a6a9

Change-Id: Ic7404abd3026a8faffaac14a20c90ebf2ef10106
 2016-09-13 22:26:03 +00:00
Treehugger Robot 3cf815a6a9 Merge "Check corruption when reading uncrypt_status file" 2016-09-13 22:20:04 +00:00
Tianjie Xu 41a3fd4e20 Check corruption when reading uncrypt_status file 
Bug: 31383361
Change-Id: I0de920916da213528d73b742e4823b4a98c63ea1
(cherry picked from commit 1c1864f321)
 2016-09-13 14:04:55 -07:00
Tianjie Xu 1c1864f321 Check corruption when reading uncrypt_status file 
Bug: 31383361
Change-Id: I0de920916da213528d73b742e4823b4a98c63ea1
 2016-09-13 13:56:00 -07:00
Damien Bargiacchi b3d92f0cf6 Merge "Have gr_init_font alloc memory for the font" into cw-f-dev 
am: 7a97733f7a

Change-Id: I24e0dae51d531adf51d8727d42ac69dd37290a03
 2016-09-13 15:52:36 +00:00
Damien Bargiacchi 8568d7e558 Have gr_init_font alloc memory for the font 
am: d00f5eb63a

Change-Id: Ic5394da1aff31adb7dda5160414a4831204fddc2
 2016-09-13 15:50:25 +00:00
Damien Bargiacchi 7a97733f7a Merge "Have gr_init_font alloc memory for the font" into cw-f-dev 2016-09-13 13:40:25 +00:00
Tianjie Xu 707583a4ab save uncrypt status to last_install am: e16e799dfd 
am: 4769f209dc

Change-Id: Ic9056d4af518df3747743ec6b2886fa437029395
 2016-09-13 01:50:40 +00:00
Tianjie Xu 4769f209dc save uncrypt status to last_install 
am: e16e799dfd

Change-Id: I0cac4258690c9ab6a6122a9e67c8453050aabcfc
 2016-09-13 01:48:10 +00:00
Tianjie Xu 5a6e719176 Merge "save uncrypt status to last_install" am: cdf509cce2 am: 6048138e10 
am: 86ea1724ae  -s ours

Change-Id: I5d55f4e63e1ec05e6bb612dd78e9caa731727843
 2016-09-13 00:08:05 +00:00
Tianjie Xu e16e799dfd save uncrypt status to last_install 
Save the uncrypt time cost to /cache/recovery/uncrypt_status. Recovery
reads the file and saves its contents to last_install.

Bug: 31383361
Test: Tested on angler and uncrypt_time reports correctly.

(cherry picked from commit fe16b5ccaf)

Change-Id: Id69681a35c7eb2f0eb21b48e3616dcda82ce41b8
 2016-09-12 16:59:48 -07:00
Tianjie Xu 86ea1724ae Merge "save uncrypt status to last_install" am: cdf509cce2 
am: 6048138e10

Change-Id: I6fa2612bc1ea1fc706a5ded855c9296b4e794009
 2016-09-12 23:03:58 +00:00
Tianjie Xu 6048138e10 Merge "save uncrypt status to last_install" 
am: cdf509cce2

Change-Id: I4ef51a1d2c75f42c31f419e68ed616838a3f8ead
 2016-09-12 23:01:28 +00:00
Tianjie Xu cdf509cce2 Merge "save uncrypt status to last_install" 2016-09-12 22:56:31 +00:00
Tianjie Xu fe16b5ccaf save uncrypt status to last_install 
Save the uncrypt time cost to /cache/recovery/uncrypt_status. Recovery
reads the file and saves its contents to last_install.

Bug: 31383361
Test: Tested on angler and uncrypt_time reports correctly.

Change-Id: I5cd3f7b6ca069d69086d09acfea8fc4f1215c833
Merged-In: I5cd3f7b6ca069d69086d09acfea8fc4f1215c833
 2016-09-12 22:55:36 +00:00
Elliott Hughes bd76bb0aa8 resolve merge conflicts of ad8b5a6 to nyc-mr1-dev-plus-aosp 
Change-Id: Ib1453d1bf3c6b83ef47a383d9d171b1059240477
 2016-09-09 14:23:31 -07:00
Damien Bargiacchi d00f5eb63a Have gr_init_font alloc memory for the font 
Change-Id: I8ccf369d52011bc5d07d8e041fe558ce734a78fc
 2016-09-09 08:32:21 -07:00
Damien Bargiacchi ad8b5a6c11 Remove duplicate thread loop 
Fixes animation running at 2x speed

Change-Id: Ieec353097b6eee1cf40530e6f4f1e69927d2bc98
 2016-09-09 08:22:49 -07:00
Damien Bargiacchi a09b65adae Remove debug log statement; fix build 
am: 43d186021a

Change-Id: Iae1fedc578f243eddb9fa8ad9e86fd82f009a958
 2016-09-08 00:19:56 +00:00
Damien Bargiacchi 43d186021a Remove debug log statement; fix build 
Change-Id: Ief92ec99d902ed58a48be9c2486cb99fdb184d7b
 2016-09-07 17:11:07 -07:00
Damien Bargiacchi 49e2aeb353 Remove duplicate methods and variables from WearRecoveryUI 
am: 5e7cfb9af6

Change-Id: I0f4dda0f92dcb6b3a230d2ad5d26f9855acb8c82
 2016-09-07 23:38:24 +00:00
Damien Bargiacchi 5e7cfb9af6 Remove duplicate methods and variables from WearRecoveryUI 
Copy pasta is never as delicious as ones hopes.

Also fix the Pike not rendering recovery bug.

Change-Id: I903da7da436e3347a22ff51633e8a0f28fea2c46
 2016-09-07 02:26:50 -07:00
Tianjie Xu ef674454a1 Merge "Switch recovery to libbase logging" am: 61590bbf0d am: c5becf0ef8 
am: ec6a47ae46  -s ours

Change-Id: Ib30bcd792f0519dc92b56d90e19adfaa71ecb5b9
 2016-09-01 23:33:29 +00:00
Tianjie Xu ec6a47ae46 Merge "Switch recovery to libbase logging" am: 61590bbf0d 
am: c5becf0ef8

Change-Id: I4c856d31d30173e2a97edbe3ecaa14cb7279c567
 2016-09-01 23:14:58 +00:00
Tianjie Xu c5becf0ef8 Merge "Switch recovery to libbase logging" 
am: 61590bbf0d

Change-Id: I246ff0e75b0610abeedf21d3c3b1a9849a68856b
 2016-09-01 23:12:01 +00:00
Tianjie Xu 61590bbf0d Merge "Switch recovery to libbase logging" 2016-09-01 23:04:37 +00:00
Tianjie Xu 073451ae21 Fix a typo of variable name in install.cpp 
Change-Id: I42057bc2fb5096ce009fe6e4b787bc9082cd572f
 2016-09-01 22:00:17 +00:00
Tianjie Xu c21edd4654 Switch recovery to libbase logging 
Clean up the recovery image and switch to libbase logging.

Bug: 28191554
Change-Id: Icd999c3cc832f0639f204b5c36cea8afe303ad35
(cherry picked from commit 747781433f)
 2016-09-01 14:32:55 -07:00
Tianjie Xu 7b0ad9c638 Switch recovery to libbase logging 
Clean up the recovery image and switch to libbase logging.

Bug: 28191554
Change-Id: Icd999c3cc832f0639f204b5c36cea8afe303ad35
Merged-In: Icd999c3cc832f0639f204b5c36cea8afe303ad35
 2016-09-01 18:33:25 +00:00
Tianjie Xu 28f6c43db5 Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 am: 852ae8d0fb 
am: 0ae9d80082

Change-Id: Ia1fbd7e0352bb34a835e2e68593c464b555f41df
 2016-09-01 18:01:09 +00:00
Tianjie Xu 0ae9d80082 Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 
am: 852ae8d0fb

Change-Id: I1ff21b583748136119ee98137c13fa3ee7a0ecc7
 2016-09-01 17:55:08 +00:00
Tianjie Xu 852ae8d0fb Merge "Check an edge case when read(2) returns 0" 
am: 3202b8faf4

Change-Id: I7d748b9f13c0f03f195f943cb3f5afa57c80296e
 2016-09-01 17:52:10 +00:00
Treehugger Robot 3202b8faf4 Merge "Check an edge case when read(2) returns 0" 2016-09-01 17:48:39 +00:00
Tianjie Xu 71e182bc38 Check an edge case when read(2) returns 0 
We might end up in an infinite loop if read(2) reached EOF unexpectedly.
The problematic code in uncrypt mentioned in the bug has been fixed
by switching to libbase ReadFully(). So I grepped through the recovery
code and fixed some other occurences of the issue.

Bug: 31073201
Change-Id: Ib867029158ba23363b8f85d61c25058a635c5a6b
 2016-08-31 19:11:41 -07:00
Josh Gao 1d873510ff Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d am: aad4cef0f3 
am: a331d85806

Change-Id: Iff2e4199993338425af704dfb885e35884e2bf4f
 2016-08-30 20:33:07 +00:00
Josh Gao a331d85806 Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d 
am: aad4cef0f3

Change-Id: I6ef1ef45fd598e12629a5bb5a28e9dca74e954fe
 2016-08-30 20:30:37 +00:00
Josh Gao aad4cef0f3 Merge "minadbd: rename adb_server_main to minadbd_main." 
am: 818394869d

Change-Id: I7a8fe351a8bfa0b7bdc48c89d56647a98018af51
 2016-08-30 20:27:39 +00:00
Josh Gao 818394869d Merge "minadbd: rename adb_server_main to minadbd_main." 2016-08-30 20:17:27 +00:00
Josh Gao acb2a2fa4c minadbd: rename adb_server_main to minadbd_main. 
adb_server_main in adb refers to the adb server on the host, not adbd.
Since there doesn't seem to be a good reason to reuse the declaration
from adb's headers, give minadbd a main function of its own.

Change-Id: I748f1a6822dc14c726cb73ef3b533c57a6615608
 2016-08-30 13:15:12 -07:00
Chih-Hung Hsieh a50d7faff0 Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 am: 9968866e86 
am: d987fe1d57

Change-Id: Idd53009ad61bb4a0b573febdbedc5dc0eee8265f
 2016-08-26 23:47:34 +00:00
Chih-Hung Hsieh d987fe1d57 Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 
am: 9968866e86

Change-Id: Id888e91546d18d5ed0054e1fbac2823a6e31c6a1
 2016-08-26 23:44:33 +00:00
Chih-Hung Hsieh 9968866e86 Merge "Fix clang-tidy warnings in bootable/recovery." 
am: 89bf2bdc85

Change-Id: I7748981badcbcdfe24d0cbe1c41007c67f611b14
 2016-08-26 23:42:05 +00:00
Treehugger Robot 89bf2bdc85 Merge "Fix clang-tidy warnings in bootable/recovery." 2016-08-26 23:29:23 +00:00