From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Wed, 11 Jul 2012 09:52:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'newui/newUI' into newUI
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=9de677a8120c3b64265dde18cb63cb6306a09027

Merge remote-tracking branch 'newui/newUI' into newUI

Conflicts:
	AndroidManifest.xml
	build.xml
	src/org/linphone/DialerActivity.java
	src/org/linphone/IncallActivity.java
	src/org/linphone/LinphoneManager.java
	src/org/linphone/LinphoneService.java
	src/org/linphone/LinphoneSimpleListener.java
	src/org/linphone/LinphoneUtils.java
	src/org/linphone/VideoCallActivity.java
	src/org/linphone/core/LinphoneCallImpl.java
	src/org/linphone/core/LinphoneCoreImpl.java
---

9de677a8120c3b64265dde18cb63cb6306a09027
diff --cc LinphoneCallLogImpl.java
index 895e27a3,996b51c1..8972f0a7
--- a/LinphoneCallLogImpl.java
+++ b/LinphoneCallLogImpl.java
@@@ -43,17 -46,18 +46,18 @@@ class LinphoneCallLogImpl implements Li
  		return new LinphoneAddressImpl(getTo(nativePtr));
  	}
  	public CallStatus getStatus() {
- 		throw new RuntimeException("not implemented yet");
+ 		return LinphoneCallLog.CallStatus.fromInt(getStatus(nativePtr));
+ 	}
+ 
+ 	public long getNativePtr() {
+ 		return nativePtr;
  	}
- 	@Override
 -
++	
  	public String getStartDate() {
- 		// TODO Auto-generated method stub
- 		return null;
+ 		return getStartDate(nativePtr);
  	}
- 	@Override
+ 
  	public int getCallDuration() {
- 		// TODO Auto-generated method stub
- 		return 0;
+ 		return getCallDuration(nativePtr);
  	}
- 
  }