update to new getDisplayInfo API

Change-Id: I8051b4f9f23d3ef4791176de1bbcfafacae7d579

Author: pixelflinger

cmds/bootanimation/BootAnimation.cpp

@@ -217,7 +217,7 @@ status_t BootAnimation::readyToRun() {
     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

@@ -46,12 +46,8 @@ static void nativeGetDefaultDisplayDeviceInfo(JNIEnv* env, jclass clazz, jobject
         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);