commit 92c6d2fc50ec2a33a2a990fe66cd70090eb461ca
author Mathias Agopian <mathias@google.com> Wed Jul 25 19:22:59 2012 -0700
committer Mathias Agopian <mathias@google.com> Wed Jul 25 20:38:27 2012 -0700
tree cb5238dfab2eaf2e7cbe6775415c30219533e204
parent aa871b0ff0fb38112a1693e80e1146cecc5db21d

update to new getDisplayInfo API

Change-Id: I8051b4f9f23d3ef4791176de1bbcfafacae7d579

cmds/bootanimation/BootAnimation.cpp

diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 6b5048607..2471a2e 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -217,7 +217,7 @@
     mAssets.addDefaultAssets();
 
     DisplayInfo dinfo;
-    status_t status = session()->getDisplayInfo(0, &dinfo);
+    status_t status = SurfaceComposerClient::getDisplayInfo(0, &dinfo);
     if (status)
         return -1;
 

services/jni/com_android_server_display_SurfaceFlingerDisplayAdapter.cpp

diff --git a/services/jni/com_android_server_display_SurfaceFlingerDisplayAdapter.cpp b/services/jni/com_android_server_display_SurfaceFlingerDisplayAdapter.cpp
index 162cbaf..e636eed 100644
--- a/services/jni/com_android_server_display_SurfaceFlingerDisplayAdapter.cpp
+++ b/services/jni/com_android_server_display_SurfaceFlingerDisplayAdapter.cpp
@@ -46,12 +46,8 @@
         return;
     }
 
-    bool rotated = (info.orientation == DISPLAY_ORIENTATION_90
-            || info.orientation == DISPLAY_ORIENTATION_270);
-    env->SetIntField(infoObj, gDisplayDeviceInfoClassInfo.width,
-            rotated ? info.h : info.w);
-    env->SetIntField(infoObj, gDisplayDeviceInfoClassInfo.height,
-            rotated ? info.w : info.h);
+    env->SetIntField(infoObj, gDisplayDeviceInfoClassInfo.width, info.w);
+    env->SetIntField(infoObj, gDisplayDeviceInfoClassInfo.height, info.h);
     env->SetFloatField(infoObj, gDisplayDeviceInfoClassInfo.refreshRate, info.fps);
     env->SetFloatField(infoObj, gDisplayDeviceInfoClassInfo.density, info.density);
     env->SetFloatField(infoObj, gDisplayDeviceInfoClassInfo.xDpi, info.xdpi);