PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
990 Commits 1 Branch 0 Tags
adf71bf71d0c3ecb68375c44fc8646860217024c
Commit Graph

990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes adf71bf71d am 5db3f978: Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined" 
* commit '5db3f97877c0aafd4513c3ed846c48b0fc148b0e':
  Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined
 2015-02-11 01:55:05 +00:00
Elliott Hughes 5db3f97877 Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined" 2015-02-11 01:37:49 +00:00
Elliott Hughes 98e2c509a6 am 78aa50d3: Merge "recovery: Handle EV_SW events" 
* commit '78aa50d3499e105d04e37ae3d3d92dad0d2c711c':
  recovery: Handle EV_SW events
 2015-02-11 00:33:17 +00:00
Elliott Hughes ee7127cca5 am bf0be350: Merge "recovery: Generate libminui dynamic library" 
* commit 'bf0be350ddf4fb75178f33ee64706cb795ceade0':
  recovery: Generate libminui dynamic library
 2015-02-11 00:33:16 +00:00
Elliott Hughes 78aa50d349 Merge "recovery: Handle EV_SW events" 2015-02-11 00:28:56 +00:00
Ajay Dudani 07d9627d7c recovery: Handle EV_SW events 
Change-Id: I29c13a941067cd1bbdced3bd67fd93293347d7b6
 2015-02-10 16:28:07 -08:00
Elliott Hughes bf0be350dd Merge "recovery: Generate libminui dynamic library" 2015-02-11 00:26:18 +00:00
Ajay Dudani 9905f3a4ee recovery: Generate libminui dynamic library 
Allow factory test images to use minui functionaltiy
by making use of libminui dynamic library.

Change-Id: I63e77420d5addbcc6eebeedc213f629085766b4c
 2015-02-10 16:25:17 -08:00
Elliott Hughes dcbf4fc571 resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aosp 
Change-Id: I6f2ea07df2ab80a44301d9c3a2a8841c40a46002
 2015-02-10 16:20:53 -08:00
Elliott Hughes 35efcd275f Merge "recovery: Properly detect userdebug or eng builds" 2015-02-10 23:55:45 +00:00
Elliott Hughes f14af80a14 recovery: Properly detect userdebug or eng builds 
The recovery system behaves a little bit differently on userdebug or
eng builds by presenting error reports to the user in the ui.
This is controlled by checking the build fingerprint for the string
:userdebug/ or :eng/. But with AOSP version numbers most AOSP
builds blows the 92 char limit of ro.build.fingerprint and therefore
the property is not set, so this condition will always be evaluated
to false, for most builds.

Instead of depending on the flaky ro.build.fingerprint this change
uses ro.debuggable.

Change-Id: I74bc00c655ac596aaf4b488ecea58f0a8de9c26b
 2015-02-10 14:46:14 -08:00
Nick Kralevich ec5c1c1e29 am 99e084ca: Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read" 
* commit '99e084ca8012bc7af52ae2fb9e72ab7180177daf':
  Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read
 2015-02-08 15:20:50 +00:00
Nick Kralevich 99e084ca80 Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read" 2015-02-08 15:09:00 +00:00
Nanik Tolaram 4e8e93b666 Remove dead/unused code and realign some of the comments 
to make it more cleaner and easier to read

Change-Id: If536d482c0ed645368084e76d8ec060f05d89137
Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
 2015-02-08 22:31:14 +11:00
Elliott Hughes 42b09d255a am 6a0d2fbc: Merge "There\'s no GPL code in \'updater\'." 
* commit '6a0d2fbcaa1740da7bb0e7a0ef8280e8b7b9bb05':
  There's no GPL code in 'updater'.
 2015-02-07 07:43:35 +00:00
Elliott Hughes 6a0d2fbcaa Merge "There's no GPL code in 'updater'." 2015-02-07 07:34:41 +00:00
Elliott Hughes 8a9014d572 There's no GPL code in 'updater'. 
This notice was added for libsyspatch and libxdelta3, but that code
has been removed since.

Change-Id: I4008878ded56ca1d5094a8208728f8c02fe1fe03
 2015-02-05 14:53:55 -08:00
Elliott Hughes 40862ab59e am aeecac54: Merge "Add missing includes." 
* commit 'aeecac5444ce55d2e82ee1b2aa35ff61a038c14e':
  Add missing includes.
 2015-01-30 21:16:36 +00:00
Elliott Hughes aeecac5444 Merge "Add missing includes." 2015-01-30 06:24:40 +00:00
Elliott Hughes cd3c55ab40 Add missing includes. 
Change-Id: I06ea08400efa511e627be37a4fd70fbdfadea2e6
 2015-01-29 20:50:08 -08:00
Elliott Hughes 22b8fe9666 am dab56cac: Merge "Add missing includes." 
* commit 'dab56cac959ce9c78e3a0a22e9ee2ff917d61bd3':
  Add missing includes.
 2015-01-28 20:48:30 +00:00
Elliott Hughes dab56cac95 Merge "Add missing includes." 2015-01-28 20:36:40 +00:00
Elliott Hughes 26dbad2b98 Add missing includes. 
Change-Id: I0737456e0221ebe9cc854d65c95a7d37d0869d56
 2015-01-28 12:09:05 -08:00
Dan Albert 88c30fb652 am eaeb55f7: Merge "Start losing code to libadb." 
* commit 'eaeb55f745c86487b4ad57da008d501fa1ebc37d':
  Start losing code to libadb.
 2015-01-27 02:08:45 +00:00
Dan Albert eaeb55f745 Merge "Start losing code to libadb." 2015-01-27 00:51:09 +00:00
Christopher Ferris 2d67a483ed am cdc38d04: Merge "Fix the v2 descriptor handling." 
* commit 'cdc38d0401f2798bb13e73d6ca290abab60fc2bf':
  Fix the v2 descriptor handling.
 2015-01-26 21:45:16 +00:00
Christopher Ferris cdc38d0401 Merge "Fix the v2 descriptor handling." 2015-01-26 21:28:21 +00:00
Christopher Ferris efa16af53e am cad5ce81: Merge "adbd: Support for new f_fs descriptor format" 
* commit 'cad5ce81adb28e131f2521fa5e553e222e0a19f4':
  adbd: Support for new f_fs descriptor format
 2015-01-26 21:21:55 +00:00
Christopher Ferris cad5ce81ad Merge "adbd: Support for new f_fs descriptor format" 2015-01-26 21:11:00 +00:00
Christopher Ferris 3ed8ef02ed Fix the v2 descriptor handling. 
There was a misinterpretation of how the v2 header works. The flags
in the header indicate what is in the rest of the structure.

Bug: 19127803
Change-Id: I83fd93df1df196300a80ddeb3b49ca7851ffcfb8
 2015-01-26 12:53:20 -08:00
Badhri Jagan Sridharan 9e3cce50a3 adbd: Support for new f_fs descriptor format 
The patch "[RFC] usb: gadget: f_fs: Add flags
to  descriptors block" marks the current
usb_functionfs_descs_head format deprecated
and introduces support for sending SuperSpeed
descriptors.

This CL makes adbd to send Descriptors in the
new format. Adbd would fall back to the old
format, if kernel is not able to recognize
the new format. This is done to prevent
adbd from breaking in the older versions
of the kernel.

Bug: 17394972

(cherry picked from commit b5b43043fa)

Change-Id: I5af9dc9d4f41ad47d678279054a648f69497b24e
 2015-01-26 12:49:13 -08:00
Elliott Hughes 4db9c8935d am d4069928: Merge "Add missing <string.h> include." 
* commit 'd40699287fb659eca92b93dd325f82babcef77e6':
  Add missing <string.h> include.
 2015-01-25 20:42:51 +00:00
Elliott Hughes d40699287f Merge "Add missing <string.h> include." 2015-01-25 16:07:26 +00:00
Elliott Hughes e01d9de981 Add missing <string.h> include. 
Change-Id: I79a9a58904b2992c306d8de0c7b3a4aacd4b67e0
 2015-01-24 22:21:24 -08:00
Kenny Root e84e931040 am eade3a80: Merge "Remove superfluous OpenSSL include paths." 
* commit 'eade3a800effe8f8fb89c8a2da12831bc5ba3239':
  Remove superfluous OpenSSL include paths.
 2015-01-23 01:20:52 +00:00
Kenny Root eade3a800e Merge "Remove superfluous OpenSSL include paths." 2015-01-23 01:10:00 +00:00
Adam Langley 6ed899a9b6 Remove superfluous OpenSSL include paths. 
This include path was needed because system/vold/cryptfs.h included an
OpenSSL header just to get the length of a SHA-256 hash. This has been
fixed in https://android-review.googlesource.com/#/c/124477/1.

Change-Id: I06a8ba0ee5b9efcc3260598f07d9819f065711de
 2015-01-22 16:47:36 -08:00
Jesse Zhao 465e870291 am 5bf74b23: Bump up max_map_count value. 
* commit '5bf74b238b402eaaf8c5bd1663fe4d592e59421f':
  Bump up max_map_count value.
 2015-01-15 19:21:03 +00:00
Jesse Zhao 5bf74b238b Bump up max_map_count value. 
Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39
Bug: 18503789
 2015-01-08 16:02:46 -08:00
Yabin Cui 479e510811 am dd719dfe: Merge "Use getmntent when accessing /proc/mounts." 
* commit 'dd719dfe4eb1d8c15342ce05d2a0ab975c390d67':
  Use getmntent when accessing /proc/mounts.
 2015-01-06 04:36:24 +00:00
Yabin Cui dd719dfe4e Merge "Use getmntent when accessing /proc/mounts." 2015-01-06 04:24:58 +00:00
Dan Albert 6bec0e51b0 am a5d63956: Merge "Remove an uninitialized value." 
* commit 'a5d63956c419f01a9e57414c23d3ded3a16e0f8a':
  Remove an uninitialized value.
 2015-01-05 21:53:26 +00:00
Dan Albert a5d63956c4 Merge "Remove an uninitialized value." 2015-01-05 21:40:11 +00:00
Yabin Cui a382e2bdb2 Use getmntent when accessing /proc/mounts. 
Bug: 18887435
Change-Id: Ice44c14fc8ee79eab259caf486e123b6af21ceb0
 2015-01-02 14:00:13 -08:00
Elliott Hughes 6bb8f47686 am 538d7d83: Merge "Fix missing #includes in bootable/recovery." 
* commit '538d7d838d82e29c738145431aa64c587dc84943':
  Fix missing #includes in bootable/recovery.
 2014-12-30 12:29:31 +00:00
Elliott Hughes 538d7d838d Merge "Fix missing #includes in bootable/recovery." 2014-12-29 21:17:56 +00:00
Elliott Hughes d4d4c2456a Fix missing #includes in bootable/recovery. 
Change-Id: I58dfbac6ca1aa80d3659f53a8fad1bbbbdc9b941
 2014-12-29 12:46:43 -08:00
Dan Albert 7279f97ab4 Remove an uninitialized value. 
The assignment of this value was removed in 0d32f25, but the
declaration was still there and still tested. Clang issues a warning
for this.

Change-Id: I748bfb8b4f78ceed1c1b5b1bb80cb4e873e4facc
 2014-12-18 22:50:08 +00:00
Sungmin Choi 8af7c5df57 am a72512cd: Add O_CREAT option for open 
* commit 'a72512cd058da7de4cdb667776ed47fad873f12c':
  Add O_CREAT option for open
 2014-12-11 19:24:52 +00:00
Sungmin Choi a72512cd05 Add O_CREAT option for open 
Factory reset fails if there is no file, for example, RECOVERY_COMMAND_FILE_TMP.
So create file as adding O_CREAT option if it does not exist.

error log:
--------- beginning of crash
12-10 02:35:17.190  3059  3059 F libc    : Fatal signal 11 (SIGSEGV), code 1, fault addr 0x30 in tid 3059 (uncrypt)
12-10 02:35:17.296   766  1528 W NativeCrashListener: Couldn't find ProcessRecord for pid 3059
12-10 02:35:17.296   191   191 I DEBUG   : *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
12-10 02:35:17.296   191   191 E DEBUG   : AM write failure (32 / Broken pipe)
12-10 02:35:17.296   191   191 I DEBUG   : Build fingerprint: 'Android/aosp_hammerhead/hammerhead:5.1/LMP/hopemini12052127:userdebug/test-keys'
12-10 02:35:17.296   191   191 I DEBUG   : Revision: '10'
12-10 02:35:17.297   191   191 I DEBUG   : ABI: 'arm'
12-10 02:35:17.297   191   191 I DEBUG   : pid: 3059, tid: 3059, name: uncrypt  >>> /system/bin/uncrypt <<<
12-10 02:35:17.297   191   191 I DEBUG   : signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0x30
12-10 02:35:17.302   191   191 I DEBUG   :     r0 00000001  r1 be94b690  r2 fffffe90  r3 b6fdbf7c
12-10 02:35:17.302   191   191 I DEBUG   :     r4 00000000  r5 00000000  r6 b6fd8ca4  r7 be94b67c
12-10 02:35:17.302   191   191 I DEBUG   :     r8 00000000  r9 ffffffff  sl b6ff582b  fp be94b68d
12-10 02:35:17.302   191   191 I DEBUG   :     ip b6fcfd08  sp be94b648  lr b6f98fe5  pc b6f98fe4  cpsr 20070030
12-10 02:35:17.303   191   191 I DEBUG   :
12-10 02:35:17.303   191   191 I DEBUG   : backtrace:
12-10 02:35:17.303   191   191 I DEBUG   :     #00 pc 00032fe4  /system/lib/libc.so (fputs+29)
12-10 02:35:17.303   191   191 I DEBUG   :     #01 pc 000016a1  /system/bin/uncrypt
12-10 02:35:17.303   191   191 I DEBUG   :     #02 pc 0000114b  /system/bin/uncrypt
12-10 02:35:17.303   191   191 I DEBUG   :     #03 pc 00012df5  /system/lib/libc.so (__libc_init+44)
12-10 02:35:17.303   191   191 I DEBUG   :     #04 pc 000013cc  /system/bin/uncrypt
12-10 02:35:17.325   191   191 I DEBUG   :
12-10 02:35:17.325   191   191 I DEBUG   : Tombstone written to: /data/tombstones/tombstone_00

Bug: 18709330
Change-Id: Ib5dccdd366e829049938a188ea5f98d9e4e282db
 2014-12-10 21:50:46 -08:00