diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 6b50486074df6..2471a2e719f31 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/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;
 
diff --git a/services/jni/com_android_server_display_SurfaceFlingerDisplayAdapter.cpp b/services/jni/com_android_server_display_SurfaceFlingerDisplayAdapter.cpp
index 162cbafb83ed1..e636eed8072a2 100644
--- a/services/jni/com_android_server_display_SurfaceFlingerDisplayAdapter.cpp
+++ b/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);