Update the ddmlib api for push/pull/install

The API now throws SyncException instead of returning SyncResult.

The IDevice API to install/uninstall now returns a single
InstallException that encapsulate all the other ddmlib
exception.

Also, the recently added exceptions now don't extend IOException
anymore.

Change-Id: Ib334c4157a6add1882233dfaaa032aea1910eede

1 files changed, 5 insertions, 2 deletions

diff --git a/screenshot/src/com/android/screenshot/Screenshot.java b/screenshot/src/com/android/screenshot/Screenshot.java
index a3fe520..930ea8e 100644
--- a/screenshot/src/com/android/screenshot/Screenshot.java
+++ b/screenshot/src/com/android/screenshot/Screenshot.java
@@ -20,6 +20,7 @@ import com.android.ddmlib.AndroidDebugBridge;
 import com.android.ddmlib.IDevice;
 import com.android.ddmlib.Log;
 import com.android.ddmlib.RawImage;
+import com.android.ddmlib.TimeoutException;
 import com.android.ddmlib.Log.ILogOutput;
 import com.android.ddmlib.Log.LogLevel;
 
@@ -198,8 +199,10 @@ public class Screenshot {
 
         try {
             rawImage = device.getScreenshot();
-        }
-        catch (IOException ioe) {
+        } catch (TimeoutException e) {
+            printAndExit("Unable to get frame buffer: timeout", true /* terminate */);
+            return;
+        } catch (Exception ioe) {
             printAndExit("Unable to get frame buffer: " + ioe.getMessage(), true /* terminate */);
             return;
         }