diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2014-07-07 15:51:46 +0800 |
|---|---|---|
| committer | emancebo <emancebo@cyngn.com> | 2014-09-04 15:20:00 -0700 |
| commit | 9185b33784377f1aabd91ec5ff68170de341f135 (patch) | |
| tree | 91d4a1e9b9fa4b6e941e826dbe01bf8070b3c08d /src/com/android/incallui/MSimInCallActivity.java | |
| parent | 37621fae82dcad13eec91816174a597ac6bef3a4 (diff) | |
| download | packages_apps_InCallUI-9185b33784377f1aabd91ec5ff68170de341f135.tar.gz packages_apps_InCallUI-9185b33784377f1aabd91ec5ff68170de341f135.tar.bz2 packages_apps_InCallUI-9185b33784377f1aabd91ec5ff68170de341f135.zip | |
InCallUI: Do not dismiss the keyguard when there is active call
The InCallUI will dismiss the keyguard when there is active call.
Add a config to check whether we need to dismiss the Keyguard screen
when there is active call, we set false as default.
CRs-Fixed: 688484
Conflicts:
src/com/android/incallui/InCallPresenter.java
Change-Id: Ifd0dbb322562464efacb9c5a8234d55055c9e8e4
Diffstat (limited to 'src/com/android/incallui/MSimInCallActivity.java')
| -rw-r--r-- | src/com/android/incallui/MSimInCallActivity.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/incallui/MSimInCallActivity.java b/src/com/android/incallui/MSimInCallActivity.java index a8350af2..42a26be5 100644 --- a/src/com/android/incallui/MSimInCallActivity.java +++ b/src/com/android/incallui/MSimInCallActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. * Not a Contribution. * * Copyright (C) 2006 The Android Open Source Project @@ -61,7 +61,6 @@ public class MSimInCallActivity extends InCallActivity { // Have the WindowManager filter out touch events that are "too fat". getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON - | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES); setTheme(R.style.InCallScreenWithActionBar); |