diff options
| author | Koushik Dutta <koushd@gmail.com> | 2013-05-05 09:44:22 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-05-05 09:44:22 -0700 |
| commit | 884ee9bbf6212b9294d89b6ba8eeabb8e671e506 (patch) | |
| tree | 94193a796a1fd80971f00e3652d4de76824eb55c | |
| parent | 6f8d24d326258f2293436c50caca1c50eccab329 (diff) | |
| parent | 07b573f20aa1e578b14e642407fb94c639ed25bd (diff) | |
| download | bootable_recovery-884ee9bbf6212b9294d89b6ba8eeabb8e671e506.zip bootable_recovery-884ee9bbf6212b9294d89b6ba8eeabb8e671e506.tar.gz bootable_recovery-884ee9bbf6212b9294d89b6ba8eeabb8e671e506.tar.bz2 | |
Merge "recovery: fix sideload cancel" into cm-10.1
| -rw-r--r-- | adb_install.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/adb_install.c b/adb_install.c index 00c3cc0..1c88f1a 100644 --- a/adb_install.c +++ b/adb_install.c @@ -129,7 +129,7 @@ apply_from_adb() { // kill the child kill(data.child, SIGTERM); - pthread_join(&sideload_thread, NULL); + pthread_join(sideload_thread, NULL); ui_clear_key_queue(); struct stat st; |