diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java index dc49d0e28..940b6605f 100644 --- a/src/org/linphone/InCallActivity.java +++ b/src/org/linphone/InCallActivity.java @@ -188,10 +188,10 @@ public class InCallActivity extends FragmentActivity implements video.setEnabled(false); micro = (TextView) findViewById(R.id.micro); micro.setOnClickListener(this); - micro.setEnabled(false); +// micro.setEnabled(false); speaker = (TextView) findViewById(R.id.speaker); speaker.setOnClickListener(this); - speaker.setEnabled(false); +// speaker.setEnabled(false); addCall = (TextView) findViewById(R.id.addCall); addCall.setOnClickListener(this); addCall.setEnabled(false); diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 9a57cd752..cdf8d740e 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -1051,7 +1051,6 @@ public final class LinphoneManager implements LinphoneCoreListener { } } } - if (state == State.Connected) { if (Hacks.needSoftvolume() || sLPref.useSoftvolume()) { adjustVolume(0); // Synchronize diff --git a/src/org/linphone/ui/PreferencesListFragment.java b/src/org/linphone/ui/PreferencesListFragment.java index 101de46ba..98d8e3d26 100644 --- a/src/org/linphone/ui/PreferencesListFragment.java +++ b/src/org/linphone/ui/PreferencesListFragment.java @@ -170,7 +170,7 @@ public class PreferencesListFragment extends ListFragment { private void bindPreferences() { final PreferenceScreen preferenceScreen = getPreferenceScreen(); - if (preferenceScreen != null) { + if (preferenceScreen != null && preferencesList != null) { preferenceScreen.bind(preferencesList); } }