diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index a479fcd03..2b6030e87 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -68,6 +68,7 @@ import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.OrientationEventListener;
+import android.view.Surface;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -166,12 +167,21 @@ public class LinphoneActivity extends FragmentActivity implements
 		int missedCalls = LinphoneManager.getLc().getMissedCallsCount();
 		displayMissedCalls(missedCalls);
 
-		int rotation = Compatibility.getRotation(getWindowManager().getDefaultDisplay());
-		// Inverse landscape rotation to initiate linphoneCore correctly
-		if (rotation == 270)
+		int rotation = getWindowManager().getDefaultDisplay().getRotation();
+		switch (rotation) {
+		case Surface.ROTATION_0:
+			rotation = 0;
+			break;
+		case Surface.ROTATION_90:
 			rotation = 90;
-		else if (rotation == 90)
+			break;
+		case Surface.ROTATION_180:
+			rotation = 180;
+			break;
+		case Surface.ROTATION_270:
 			rotation = 270;
+			break;
+		}
 
 		LinphoneManager.getLc().setDeviceRotation(rotation);
 		mAlwaysChangingPhoneAngle = rotation;
diff --git a/src/org/linphone/compatibility/ApiEightPlus.java b/src/org/linphone/compatibility/ApiEightPlus.java
index 01c88dabd..6cc776be7 100644
--- a/src/org/linphone/compatibility/ApiEightPlus.java
+++ b/src/org/linphone/compatibility/ApiEightPlus.java
@@ -34,10 +34,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 @TargetApi(8)
 public class ApiEightPlus {
 
-	public static int getRotation(Display display) {
-		return display.getRotation();
-	}
-
 	public static void initPushNotificationService(Context context) {
 		try {
 			// Starting the push notification service
diff --git a/src/org/linphone/compatibility/ApiFivePlus.java b/src/org/linphone/compatibility/ApiFivePlus.java
index 7809702ca..042e56697 100644
--- a/src/org/linphone/compatibility/ApiFivePlus.java
+++ b/src/org/linphone/compatibility/ApiFivePlus.java
@@ -332,10 +332,6 @@ public class ApiFivePlus {
 		return null;
 	}
 	
-	public static int getRotation(Display display) {
-		return display.getOrientation();
-	}
-	
 	public static Notification createMessageNotification(Context context, String title, String msg, PendingIntent intent) {
 		Notification notif = new Notification();
 		notif.icon = R.drawable.chat_icon_over;
diff --git a/src/org/linphone/compatibility/Compatibility.java b/src/org/linphone/compatibility/Compatibility.java
index 45cf16173..56f5d23d5 100644
--- a/src/org/linphone/compatibility/Compatibility.java
+++ b/src/org/linphone/compatibility/Compatibility.java
@@ -159,14 +159,6 @@ public class Compatibility {
 		return null;
 	}
 
-	public static int getRotation(Display display) {
-		if (Version.sdkStrictlyBelow(Version.API08_FROYO_22)) {
-			return ApiFivePlus.getRotation(display);
-		} else {
-			return ApiEightPlus.getRotation(display);
-		}
-	}
-	
 	public static void setNotificationLatestEventInfo(Notification notif, Context context, String title, String content, PendingIntent intent) {
 		if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30)) {
 			ApiElevenPlus.setNotificationLatestEventInfo(notif, context, title, content, intent);