Merge lp:~chunsang/phablet-tools/phablet-tools into lp:phablet-tools

[Chunsang Jeong]

Remove screenshot_sf not to check if sf is running on device, which still used out of dated screencap and made screenshot fail onto certain devices where sf is running to use android specified codecs.

Fix for https://bugs.launchpad.net/avila-private/+bug/1555678

[Pat McGowan (pat-mcgowan)]

Looks good
Can you attach this MR to https://bugs.launchpad.net/ubuntu/+source/phablet-tools/+bug/1583230

review: Approve

[Chunsang Jeong (chunsang)]

Any chance to be merged soon? or need more review?

Unmerged revisions

359. By Chunsang Jeong on 2016-06-02

Remove screenshot_sf not to check if sf is running on device, which still used out of dated screencap and made screenshot fail onto certain devices where sf is running to use android specified codecs. Fix for https://bugs.launchpad.net/avila-private/+bug/1555678

=== modified file 'phablet-screenshot'
--- phablet-screenshot	2014-06-07 08:31:32 +0000
+++ phablet-screenshot	2016-06-02 05:57:59 +0000
@@ -84,18 +84,6 @@
     fi
 }
 
-sf_is_running() {
-    #  Return 0 if surface flinger is running then we'll use screencap
-    #  instead
-    sf=$(adb shell pidof surfaceflinger)
-    if [ -z "$sf" ]; then
-        return 1
-    else
-        echo "I: surfaceflinger detected"
-        return 0
-    fi
-}
-
 screenshot_mir() {
     # Dump framebuffer to capture Mir screenshot
     #
@@ -130,17 +118,6 @@
     echo "$device"|tr -d '\r'
 }
 
-screenshot_sf() {
-    # Use screencap if surfaceflinger is running
-    echo "I: Capturing screenshot with screencap ..."
-    capfile=screencap.png
-    adb shell /system/bin/screencap /tmp/$capfile
-    adb pull /tmp/$capfile ${PICDIR}/$capfile
-
-    [ ! -e "${PICDIR}/${capfile}" ] && echo "E: Capture failed!" && return
-    convert $CONVERTOPTS ${PICDIR}/$capfile "$DST"
-}
-
 SHORTOPTS="hdr:s:z:"
 LONGOPTS="help,debug,resolution:,serial:,resize:"
 
@@ -184,19 +161,15 @@
 
 check_devices
 
-if sf_is_running; then
-    # Use screencap for surfaceflinger
-    screenshot_sf
-else
-    # Otherwise just dump the framebuffer
-    # Set resolution and depth for device
-    depth=8
-    size="$(adb shell fbset|sed -n -e's/^mode.*\"\([0-9]\+x[0-9]\+\)[-\"].*$/\1/p')"
-    device="$(get_device)"
-    if [ -z "$size" ]; then
-        echo "E: Resolution not found. Device is not supported."
-        exit 1
-    fi
-    screenshot_mir "$size" "$depth" "$device"
+# Dump the framebuffer
+# Set resolution and depth for device
+depth=8
+size="$(adb shell fbset|sed -n -e's/^mode.*\"\([0-9]\+x[0-9]\+\)[-\"].*$/\1/p')"
+device="$(get_device)"
+if [ -z "$size" ]; then
+    echo "E: Resolution not found. Device is not supported."
+    exit 1
 fi
+screenshot_mir "$size" "$depth" "$device"
+
 echo "I: Done"