diff -Nru android-20140222-0129/bootable/recovery/recovery.c android-20140224-0005/bootable/recovery/recovery.c --- android-20140222-0129/bootable/recovery/recovery.c 2014-02-22 01:44:42.000000000 +0000 +++ android-20140224-0005/bootable/recovery/recovery.c 2014-02-24 00:21:14.000000000 +0000 @@ -1003,6 +1003,9 @@ property_set("ctl.stop", argv[1]); return 0; } + /* Make sure stdout is not fully buffered, we don't want to + * have issues when calling busybox commands */ + setlinebuf(stdout); return busybox_driver(argc, argv); } __system("/sbin/postrecoveryboot.sh"); Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/icon_installing_overlay01.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/icon_installing_overlay01.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/icon_installing_overlay02.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/icon_installing_overlay02.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/icon_installing_overlay03.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/icon_installing_overlay03.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/icon_installing_overlay04.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/icon_installing_overlay04.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/icon_installing_overlay05.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/icon_installing_overlay05.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/icon_installing_overlay06.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/icon_installing_overlay06.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/icon_installing_overlay07.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/icon_installing_overlay07.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/icon_installing_overlay08.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/icon_installing_overlay08.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/icon_installing_overlay09.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/icon_installing_overlay09.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/icon_installing_overlay10.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/icon_installing_overlay10.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/icon_installing_overlay11.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/icon_installing_overlay11.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/icon_installing_overlay12.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/icon_installing_overlay12.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/icon_installing.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/icon_installing.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/indeterminate01.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/indeterminate01.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/indeterminate02.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/indeterminate02.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/indeterminate03.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/indeterminate03.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/indeterminate04.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/indeterminate04.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/indeterminate05.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/indeterminate05.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/indeterminate06.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/indeterminate06.png differ Binary files /tmp/bqp67e0AMH/android-20140222-0129/bootable/recovery/res/images/progress_fill.png and /tmp/6WBJs5yC4M/android-20140224-0005/bootable/recovery/res/images/progress_fill.png differ diff -Nru android-20140222-0129/bootable/recovery/system-image-upgrader android-20140224-0005/bootable/recovery/system-image-upgrader --- android-20140222-0129/bootable/recovery/system-image-upgrader 2014-02-22 01:44:42.000000000 +0000 +++ android-20140224-0005/bootable/recovery/system-image-upgrader 2014-02-24 00:21:14.000000000 +0000 @@ -237,18 +237,18 @@ rm -f removed # Process partition images - while read line; do + grep "^/dev" /etc/recovery.fstab | while read line; do set -- $line - part=${1##/} - path=$3 + part=${2##/} + path=$1 if [ -e partitions/${part}.img ] && [ -e $path ]; then echo "Flashing ${part} at ${path}" cat partitions/${part}.img > ${path} rm partitions/${part}.img fi - done < /etc/recovery.fstab + done ;; *) diff -Nru android-20140222-0129/bootable/recovery/ui.c android-20140224-0005/bootable/recovery/ui.c --- android-20140222-0129/bootable/recovery/ui.c 2014-02-22 01:44:42.000000000 +0000 +++ android-20140224-0005/bootable/recovery/ui.c 2014-02-24 00:21:14.000000000 +0000 @@ -61,8 +61,8 @@ UIParameters ui_parameters = { 6, // indeterminate progress bar frames 20, // fps - 7, // installation icon frames (0 == static image) - 13, 190, // installation icon overlay offset + 12, // installation icon frames (0 == static image) + 19, 19, // installation icon overlay offset }; static pthread_mutex_t gUpdateMutex = PTHREAD_MUTEX_INITIALIZER; diff -Nru android-20140222-0129/debian/changelog android-20140224-0005/debian/changelog --- android-20140222-0129/debian/changelog 2014-02-22 02:21:50.000000000 +0000 +++ android-20140224-0005/debian/changelog 2014-02-24 01:06:26.000000000 +0000 @@ -1,3 +1,11 @@ +android (20140224-0005-0ubuntu1) trusty; urgency=medium + + * New upstream snapshot: + - recovery: Add Ubuntu icons for system image update + - system-image-upgrader: 4.4.2 has a different format for recovery.fstab + + -- Ricardo Salveti de Araujo Sun, 23 Feb 2014 22:05:13 -0300 + android (20140222-0129-0ubuntu1) trusty; urgency=medium * New upstream snapshot: diff -Nru android-20140222-0129/debian/patches/recovery.c-make-sure-stdout-is-not-fully-buffered.patch android-20140224-0005/debian/patches/recovery.c-make-sure-stdout-is-not-fully-buffered.patch --- android-20140222-0129/debian/patches/recovery.c-make-sure-stdout-is-not-fully-buffered.patch 2014-02-22 02:22:38.000000000 +0000 +++ android-20140224-0005/debian/patches/recovery.c-make-sure-stdout-is-not-fully-buffered.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -From: Ricardo Salveti de Araujo -Date: Fri, 21 Feb 2014 22:22:44 -0300 -Subject: [PATCH] recovery.c: make sure stdout is not fully buffered - -Otherwise it might cause issues when executing busybox commands. - -Change-Id: I880a65f1cfdca49bc84bcbdf66ccb08ed617e751 -Signed-off-by: Ricardo Salveti de Araujo ---- - bootable/recovery/recovery.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/bootable/recovery/recovery.c b/bootable/recovery/recovery.c -index d5c3432..51f061e 100644 ---- a/bootable/recovery/recovery.c -+++ b/bootable/recovery/recovery.c -@@ -1003,6 +1003,9 @@ main(int argc, char **argv) { - property_set("ctl.stop", argv[1]); - return 0; - } -+ /* Make sure stdout is not fully buffered, we don't want to -+ * have issues when calling busybox commands */ -+ setlinebuf(stdout); - return busybox_driver(argc, argv); - } - __system("/sbin/postrecoveryboot.sh"); --- -1.9.rc1 - diff -Nru android-20140222-0129/debian/patches/series android-20140224-0005/debian/patches/series --- android-20140222-0129/debian/patches/series 2014-02-22 02:20:15.000000000 +0000 +++ android-20140224-0005/debian/patches/series 2014-02-24 01:04:59.000000000 +0000 @@ -1,4 +1,3 @@ use_local_kernel.diff disable-tests.patch emulator-disabling-translator-libs-for-64-bits.patch -recovery.c-make-sure-stdout-is-not-fully-buffered.patch diff -Nru android-20140222-0129/ubuntu/libhybris/debian/changelog android-20140224-0005/ubuntu/libhybris/debian/changelog --- android-20140222-0129/ubuntu/libhybris/debian/changelog 2014-02-22 01:46:18.000000000 +0000 +++ android-20140224-0005/ubuntu/libhybris/debian/changelog 2014-02-24 00:22:45.000000000 +0000 @@ -1,3 +1,9 @@ +libhybris (0.1.0+git20131207+e452e83-0ubuntu7) trusty; urgency=medium + + * media: fixing code for 4.4 and improving the release_output_buffer logic + + -- Ricardo Salveti de Araujo Fri, 21 Feb 2014 00:57:19 -0300 + libhybris (0.1.0+git20131207+e452e83-0ubuntu6) trusty; urgency=medium * Making compat code compatible with Android 4.4.2 diff -Nru android-20140222-0129/ubuntu/platform-api/debian/changelog android-20140224-0005/ubuntu/platform-api/debian/changelog --- android-20140222-0129/ubuntu/platform-api/debian/changelog 2014-02-22 01:46:18.000000000 +0000 +++ android-20140224-0005/ubuntu/platform-api/debian/changelog 2014-02-24 00:22:46.000000000 +0000 @@ -1,3 +1,11 @@ +platform-api (0.20+14.04.20140221-0ubuntu1) trusty; urgency=low + + [ thomas-voss ] + * Remove obsolete assert on bridge as failures are captured higher up + in the stack now. + + -- Ubuntu daily release Fri, 21 Feb 2014 13:25:48 +0000 + platform-api (0.20+14.04.20140214-0ubuntu1) trusty; urgency=low [ Daniel d'Andrada ] diff -Nru android-20140222-0129/ubuntu/platform-api/src/ubuntu/hybris/bridge.h android-20140224-0005/ubuntu/platform-api/src/ubuntu/hybris/bridge.h --- android-20140222-0129/ubuntu/platform-api/src/ubuntu/hybris/bridge.h 2014-02-22 01:46:18.000000000 +0000 +++ android-20140224-0005/ubuntu/platform-api/src/ubuntu/hybris/bridge.h 2014-02-24 00:22:46.000000000 +0000 @@ -90,8 +90,6 @@ lib_handle = dlopen(path, RTLD_LAZY); dlsym_fn = dlsym; } - - assert(lib_handle && "Error loading ubuntu_application_api"); } ~Bridge()