summaryrefslogtreecommitdiff
path: root/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'java/com')
-rw-r--r--java/com/android/incallui/InCallActivity.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index 47b5986a0..c4c365afa 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -261,10 +261,11 @@ public class InCallActivity extends TransactionSafeFragmentActivity
WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
| WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES;
- // When the audio stream is not directed through Bluetooth, turn the screen on once the
- // activity is shown.
+ // When the audio stream is not via Bluetooth, turn on the screen once the activity is shown.
+ // When the audio stream is via Bluetooth, turn on the screen only for an incoming call.
final int audioRoute = getAudioRoute();
- if (audioRoute != CallAudioState.ROUTE_BLUETOOTH) {
+ if (audioRoute != CallAudioState.ROUTE_BLUETOOTH
+ || CallList.getInstance().getIncomingCall() != null) {
flags |= WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
}