summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 78aa50d3: Merge "recovery: Handle EV_SW events"Elliott Hughes2015-02-111-2/+2
|\ | | | | | | | | * commit '78aa50d3499e105d04e37ae3d3d92dad0d2c711c': recovery: Handle EV_SW events
| * Merge "recovery: Handle EV_SW events"Elliott Hughes2015-02-111-2/+2
| |\
| | * recovery: Handle EV_SW eventsAjay Dudani2015-02-101-2/+2
| |/ | | | | | | Change-Id: I29c13a941067cd1bbdced3bd67fd93293347d7b6
* | am bf0be350: Merge "recovery: Generate libminui dynamic library"Elliott Hughes2015-02-111-0/+7
|\ \ | |/ | | | | | | * commit 'bf0be350ddf4fb75178f33ee64706cb795ceade0': recovery: Generate libminui dynamic library
| * Merge "recovery: Generate libminui dynamic library"Elliott Hughes2015-02-111-0/+7
| |\
| | * recovery: Generate libminui dynamic libraryAjay Dudani2015-02-101-0/+7
| |/ | | | | | | | | | | | | Allow factory test images to use minui functionaltiy by making use of libminui dynamic library. Change-Id: I63e77420d5addbcc6eebeedc213f629085766b4c
* | resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aospElliott Hughes2015-02-103-6/+10
|\ \ | |/ | | | | Change-Id: I6f2ea07df2ab80a44301d9c3a2a8841c40a46002
| * Merge "recovery: Properly detect userdebug or eng builds"Elliott Hughes2015-02-103-6/+10
| |\
| | * recovery: Properly detect userdebug or eng buildsElliott Hughes2015-02-103-6/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 99e084ca: Merge "Remove dead/unused code and realign some of the comments ↵Nick Kralevich2015-02-083-23/+8
|\ \ | |/ | | | | | | | | | | 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
| * Merge "Remove dead/unused code and realign some of the comments to make it ↵Nick Kralevich2015-02-083-23/+8
| |\ | | | | | | | | | more cleaner and easier to read"
| | * Remove dead/unused code and realign some of the commentsNanik Tolaram2015-02-083-23/+8
| |/ | | | | | | | | | | | | to make it more cleaner and easier to read Change-Id: If536d482c0ed645368084e76d8ec060f05d89137 Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
* | am 6a0d2fbc: Merge "There\'s no GPL code in \'updater\'."Elliott Hughes2015-02-072-339/+0
|\ \ | |/ | | | | | | * commit '6a0d2fbcaa1740da7bb0e7a0ef8280e8b7b9bb05': There's no GPL code in 'updater'.
| * Merge "There's no GPL code in 'updater'."Elliott Hughes2015-02-072-339/+0
| |\
| | * There's no GPL code in 'updater'.Elliott Hughes2015-02-052-339/+0
| |/ | | | | | | | | | | | | This notice was added for libsyspatch and libxdelta3, but that code has been removed since. Change-Id: I4008878ded56ca1d5094a8208728f8c02fe1fe03
* | am aeecac54: Merge "Add missing includes."Elliott Hughes2015-01-3011-0/+12
|\ \ | |/ | | | | | | * commit 'aeecac5444ce55d2e82ee1b2aa35ff61a038c14e': Add missing includes.
| * Merge "Add missing includes."Elliott Hughes2015-01-3011-0/+12
| |\
| | * Add missing includes.Elliott Hughes2015-01-2911-0/+12
| |/ | | | | | | Change-Id: I06ea08400efa511e627be37a4fd70fbdfadea2e6
* | am dab56cac: Merge "Add missing includes."Elliott Hughes2015-01-284-2/+6
|\ \ | |/ | | | | | | * commit 'dab56cac959ce9c78e3a0a22e9ee2ff917d61bd3': Add missing includes.
| * Merge "Add missing includes."Elliott Hughes2015-01-284-2/+6
| |\
| | * Add missing includes.Elliott Hughes2015-01-284-2/+6
| |/ | | | | | | Change-Id: I0737456e0221ebe9cc854d65c95a7d37d0869d56
* | am eaeb55f7: Merge "Start losing code to libadb."Dan Albert2015-01-273-698/+1
|\ \ | |/ | | | | | | * commit 'eaeb55f745c86487b4ad57da008d501fa1ebc37d': Start losing code to libadb.
| * Merge "Start losing code to libadb."Dan Albert2015-01-273-698/+1
| |\
| | * Start losing code to libadb.Dan Albert2014-11-253-698/+1
| | | | | | | | | | | | | | | Bug: 17626262 Change-Id: I8ce7cff2b7789f39f35a4211d7120d072c05a863
* | | am cdc38d04: Merge "Fix the v2 descriptor handling."Christopher Ferris2015-01-261-11/+6
|\ \ \ | |/ / | | | | | | | | | * commit 'cdc38d0401f2798bb13e73d6ca290abab60fc2bf': Fix the v2 descriptor handling.
| * | Merge "Fix the v2 descriptor handling."Christopher Ferris2015-01-261-11/+6
| |\ \
| | * | Fix the v2 descriptor handling.Christopher Ferris2015-01-261-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am cad5ce81: Merge "adbd: Support for new f_fs descriptor format"Christopher Ferris2015-01-261-54/+107
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'cad5ce81adb28e131f2521fa5e553e222e0a19f4': adbd: Support for new f_fs descriptor format
| * | | Merge "adbd: Support for new f_fs descriptor format"Christopher Ferris2015-01-261-54/+107
| |\ \ \ | | |/ /
| | * | adbd: Support for new f_fs descriptor formatBadhri Jagan Sridharan2015-01-261-54/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 b5b43043fa71f9cb620ddd02ec2bc98eced5a6ce) Change-Id: I5af9dc9d4f41ad47d678279054a648f69497b24e
* | | | am d4069928: Merge "Add missing <string.h> include."Elliott Hughes2015-01-251-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd40699287fb659eca92b93dd325f82babcef77e6': Add missing <string.h> include.
| * | | Merge "Add missing <string.h> include."Elliott Hughes2015-01-251-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Add missing <string.h> include.Elliott Hughes2015-01-241-0/+1
| | | | | | | | | | | | | | | | Change-Id: I79a9a58904b2992c306d8de0c7b3a4aacd4b67e0
* | | | am eade3a80: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-231-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'eade3a800effe8f8fb89c8a2da12831bc5ba3239': Remove superfluous OpenSSL include paths.
| * | | Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-231-1/+0
| |\ \ \ | | |/ / | |/| |
| | * | Remove superfluous OpenSSL include paths.Adam Langley2015-01-221-1/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | 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
* | | am 5bf74b23: Bump up max_map_count value.Jesse Zhao2015-01-151-0/+1
|\ \ \ | | | | | | | | | | | | | | | | * commit '5bf74b238b402eaaf8c5bd1663fe4d592e59421f': Bump up max_map_count value.
| * | | Bump up max_map_count value.Jesse Zhao2015-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39 Bug: 18503789
* | | | am dd719dfe: Merge "Use getmntent when accessing /proc/mounts."Yabin Cui2015-01-061-75/+14
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'dd719dfe4eb1d8c15342ce05d2a0ab975c390d67': Use getmntent when accessing /proc/mounts.
| * | | Merge "Use getmntent when accessing /proc/mounts."Yabin Cui2015-01-061-75/+14
| |\ \ \
| | * | | Use getmntent when accessing /proc/mounts.Yabin Cui2015-01-021-75/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18887435 Change-Id: Ice44c14fc8ee79eab259caf486e123b6af21ceb0
* | | | | am a5d63956: Merge "Remove an uninitialized value."Dan Albert2015-01-051-2/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a5d63956c419f01a9e57414c23d3ded3a16e0f8a': Remove an uninitialized value.
| * | | | Merge "Remove an uninitialized value."Dan Albert2015-01-051-2/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove an uninitialized value.Dan Albert2014-12-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 538d7d83: Merge "Fix missing #includes in bootable/recovery."Elliott Hughes2014-12-302-2/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '538d7d838d82e29c738145431aa64c587dc84943': Fix missing #includes in bootable/recovery.
| * | | | Merge "Fix missing #includes in bootable/recovery."Elliott Hughes2014-12-292-2/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix missing #includes in bootable/recovery.Elliott Hughes2014-12-292-2/+4
| |/ / / | | | | | | | | | | | | Change-Id: I58dfbac6ca1aa80d3659f53a8fad1bbbbdc9b941
* | | | am a72512cd: Add O_CREAT option for openSungmin Choi2014-12-111-2/+10
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'a72512cd058da7de4cdb667776ed47fad873f12c': Add O_CREAT option for open
| * | | Add O_CREAT option for openSungmin Choi2014-12-101-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am f59b9942: Add basic navigation controls to log viewer.Patrick Tjin2014-12-101-2/+36
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f59b994264b2e8ffe179e2405cda81811f8a9db1': Add basic navigation controls to log viewer.
generated by cgit v1.1 at 2024-12-23 04:12:46 +0000