Merge branch 'master' of git.linphone.org:linphone-android

Conflicts:
	submodules/linphone
This commit is contained in:
Guillaume Beraudo 2011-06-01 11:39:07 +02:00
commit 600102e268

View file

@ -49,7 +49,7 @@ class AndroidCameraConf9 implements AndroidCameraConf {
public int getCameraOrientation(int cameraId) { public int getCameraOrientation(int cameraId) {
android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo(); android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo();
Camera.getCameraInfo(cameraId, info); Camera.getCameraInfo(cameraId, info);
Log.d(LinphoneManager.TAG, String.format("Camera info for %i: orientation=%i returned=%i ", Log.d(LinphoneManager.TAG, String.format("Camera info for %d: orientation=%d returned=%d ",
cameraId, cameraId,
info.orientation, info.orientation,
(info.orientation - 90) %360)); (info.orientation - 90) %360));