diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6171b52ef..b87ec4f0b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="1100" android:versionName="1.1.0" android:installLocation="auto"> diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so index 8e4ce1a95..6449a20c3 100755 Binary files a/libs/armeabi-v7a/liblinphone.so and b/libs/armeabi-v7a/liblinphone.so differ diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so index 0d6fdb167..f5163ec8e 100755 Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java index 15750f9b8..cb2ae8022 100644 --- a/src/org/linphone/DialerActivity.java +++ b/src/org/linphone/DialerActivity.java @@ -39,7 +39,6 @@ import android.content.Intent; import android.content.SharedPreferences; import android.media.AudioManager; import android.media.MediaPlayer; -import android.media.RingtoneManager; import android.os.Build; import android.os.Bundle; import android.os.PowerManager; @@ -225,7 +224,6 @@ public class DialerActivity extends Activity implements LinphoneCoreListener { // so disabling it totally mSpeaker.setVisibility(View.GONE); } - mInCallControlRow.setVisibility(View.GONE); mInCallAddressLayout.setVisibility(View.GONE); mDecline.setEnabled(false); @@ -553,6 +551,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener { } else { mAudioManager.setSpeakerphoneOn(true); } + } private void routeAudioToReceiver() { if (Integer.parseInt(Build.VERSION.SDK) <=4 /*