summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Lin <samlin@google.com>2013-11-06 18:23:02 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-06 18:23:02 -0800
commitf4efb5d390692d1c4ab2880926c51ae82bec3745 (patch)
tree3c042a5de95c0fb1930c7bfb1d75d8371f160fc9
parent7bcb7463464287e9e262076af1d1c5bb32a406f4 (diff)
parentd27f170a22d9374cadfa2d65a8e920708ef88f9d (diff)
am 52dfdccc: am 84fa4c5b: am 4fa3514d: am 42d55df9: Disable HW BACK key at the incoming-call screen
* commit '52dfdcccf27d3dda4726d0bb6ec6321221a10115': Disable HW BACK key at the incoming-call screen
-rw-r--r--InCallUI/src/com/android/incallui/InCallActivity.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index d018b9d8a..36fb3897a 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -202,6 +202,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 inconing call");
+ return;
+ }
+
// Nothing special to do. Fall back to the default behavior.
super.onBackPressed();
}