From ae3e5b7e380681df530946ce0d39fc6284755401 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Mon, 15 Dec 2014 23:22:57 +0000
Subject: Revert "Allow back to be pressed while in incoming call screen"

This reverts commit bd9ccd501ebd83508dfe52121e0f4827cc6e1fa3.

Bug: 18742942
Change-Id: I8016ddae8addb56b4d6350748628fec351e6531a
---
 src/com/android/incallui/InCallActivity.java | 7 +++++++
 1 file changed, 7 insertions(+)

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();
     }
-- 
cgit v1.2.3