Merge "Only rotate screenshots on pre-M devices." into emu-master-dev
diff --git a/uiautomatorviewer/src/main/java/com/android/uiautomator/UiAutomatorHelper.java b/uiautomatorviewer/src/main/java/com/android/uiautomator/UiAutomatorHelper.java
index 0d11dd7..4591b02 100644
--- a/uiautomatorviewer/src/main/java/com/android/uiautomator/UiAutomatorHelper.java
+++ b/uiautomatorviewer/src/main/java/com/android/uiautomator/UiAutomatorHelper.java
@@ -167,11 +167,13 @@
throw new UiAutomatorException(msg, e);
}
- // rotate the screen shot per device rotation
- BasicTreeNode root = model.getXmlRootNode();
- if (root instanceof RootWindowNode) {
- for (int i = 0; i < ((RootWindowNode)root).getRotation(); i++) {
- rawImage = rawImage.getRotated();
+ // On pre-M platforms, we need to rotate the screen shot ourselves
+ if (device.getApiLevel() < 23) {
+ BasicTreeNode root = model.getXmlRootNode();
+ if (root instanceof RootWindowNode) {
+ for (int i = 0; i < ((RootWindowNode)root).getRotation(); i++) {
+ rawImage = rawImage.getRotated();
+ }
}
}
PaletteData palette = new PaletteData(
