summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-12-15 23:22:57 +0000
committerYorke Lee <yorkelee@google.com>2014-12-15 23:22:57 +0000
commitae3e5b7e380681df530946ce0d39fc6284755401 (patch)
treed0b6c9046ce377c42d921b1117f9df54dcfd2aa2
parentbd9ccd501ebd83508dfe52121e0f4827cc6e1fa3 (diff)
downloadpackages_apps_InCallUI-ae3e5b7e380681df530946ce0d39fc6284755401.tar.gz
packages_apps_InCallUI-ae3e5b7e380681df530946ce0d39fc6284755401.tar.bz2
packages_apps_InCallUI-ae3e5b7e380681df530946ce0d39fc6284755401.zip
Revert "Allow back to be pressed while in incoming call screen"
This reverts commit bd9ccd501ebd83508dfe52121e0f4827cc6e1fa3. Bug: 18742942 Change-Id: I8016ddae8addb56b4d6350748628fec351e6531a
-rw-r--r--src/com/android/incallui/InCallActivity.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java
index bbec3bce..a6917c86 100644
--- a/src/com/android/incallui/InCallActivity.java
+++ b/src/com/android/incallui/InCallActivity.java
@@ -319,6 +319,13 @@ public class InCallActivity extends Activity {
return;
}
+ // Always disable the Back key while an incoming call is ringing
+ final Call call = CallList.getInstance().getIncomingCall();
+ if (call != null) {
+ Log.d(this, "Consume Back press for an incoming call");
+ return;
+ }
+
// Nothing special to do. Fall back to the default behavior.
super.onBackPressed();
}