Merge "Revert "Allow back to be pressed while in incoming call screen"" into lmp-mr1-dev

1 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java
index 00693641..6f48a359 100644
--- a/src/com/android/incallui/InCallActivity.java
+++ b/src/com/android/incallui/InCallActivity.java
@@ -330,6 +330,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();
     }