Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixing a bug on Samsung devices with proximity sensor

Browse source
This commit is contained in:
Erwan Croze 2017-01-09 13:40:45 +01:00
parent 41bbf3592c
commit fc12c9643c
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/org/linphone/CallActivity.java
View file

@ -1235,7 +1235,9 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
mControlsHandler.removeCallbacks(mControls); mControlsHandler.removeCallbacks(mControls);
} }
mControls = null; mControls = null;
enableProximitySensing(false); // Workaround for proximity sensor bug on Samsung devices
if (lc.getCurrentCall() != null && lc.getCurrentCall().getState() != State.StreamsRunning)
enableProximitySensing(false);
} }
@Override @Override
@ -1546,7 +1548,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
final float distanceInCm = event.values[0]; final float distanceInCm = event.values[0];
final float maxDistance = event.sensor.getMaximumRange(); final float maxDistance = event.sensor.getMaximumRange();
Log.d("Proximity sensor report [",distanceInCm,"] , for max range [",maxDistance,"]"); Log.d("Proximity sensor report ["+distanceInCm+"] , for max range ["+maxDistance+"]");
if (maxDistance <= threshold) { if (maxDistance <= threshold) {
// Case binary 0/1 and short sensors // Case binary 0/1 and short sensors

4
src/org/linphone/LinphoneActivity.java
View file

@ -1096,8 +1096,8 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
} }
} else if (resultCode == Activity.RESULT_FIRST_USER && requestCode == CALL_ACTIVITY) { } else if (resultCode == Activity.RESULT_FIRST_USER && requestCode == CALL_ACTIVITY) {
getIntent().putExtra("PreviousActivity", CALL_ACTIVITY); getIntent().putExtra("PreviousActivity", CALL_ACTIVITY);
callTransfer = data == null ? false : data.getBooleanExtra("Transfer", false); callTransfer = data != null && data.getBooleanExtra("Transfer", false);
boolean chat = data == null ? false : data.getBooleanExtra("chat", false); boolean chat = data != null && data.getBooleanExtra("chat", false);
if(chat){ if(chat){
pendingFragmentTransaction = FragmentsAvailable.CHAT_LIST; pendingFragmentTransaction = FragmentsAvailable.CHAT_LIST;
} }