summaryrefslogtreecommitdiffstats
path: root/policy/com
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2010-02-12 12:12:06 -0800
committerWink Saville <wink@google.com>2010-02-12 12:12:06 -0800
commitd2e6a33cb1b6213bde5a1d62c7c415e954317ef9 (patch)
tree34ac6175d72f0082cf6a31bb6238f804566a8b61 /policy/com
parentfe8fdab585e44396cf3f95c2aa78b649f3686312 (diff)
downloadframeworks_base-d2e6a33cb1b6213bde5a1d62c7c415e954317ef9.zip
frameworks_base-d2e6a33cb1b6213bde5a1d62c7c415e954317ef9.tar.gz
frameworks_base-d2e6a33cb1b6213bde5a1d62c7c415e954317ef9.tar.bz2
Change EndCallBehavior while in UTS test mode.
When in UTS test mode this reverts the behavior of the end key as it was in cupcake. When not in UTS test mode the behavior is as before the change. The UTS test mode is enabled when presist.sys.uts-test-mode is 1. Bug: 2402366 Change-Id: I81359f3870a1e4da513f76c32aecdb7dfdf3bacf
Diffstat (limited to 'policy/com')
-rwxr-xr-xpolicy/com/android/internal/policy/impl/PhoneWindowManager.java25
1 files changed, 15 insertions, 10 deletions
diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
index 7be15e2..7970987 100755
--- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -2162,16 +2162,21 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// This code brings home to the front or, if it is already
// at the front, puts the device to sleep.
try {
- ActivityManagerNative.getDefault().stopAppSwitches();
- sendCloseSystemWindows();
- Intent dock = createHomeDockIntent();
- if (dock != null) {
- int result = ActivityManagerNative.getDefault()
- .startActivity(null, dock,
- dock.resolveTypeIfNeeded(mContext.getContentResolver()),
- null, 0, null, null, 0, true /* onlyIfNeeded*/, false);
- if (result == IActivityManager.START_RETURN_INTENT_TO_CALLER) {
- return false;
+ if (SystemProperties.getInt("persist.sys.uts-test-mode", 0) == 1) {
+ /// Roll back EndcallBehavior as the cupcake design to pass P1 lab entry.
+ Log.d(TAG, "UTS-TEST-MODE");
+ } else {
+ ActivityManagerNative.getDefault().stopAppSwitches();
+ sendCloseSystemWindows();
+ Intent dock = createHomeDockIntent();
+ if (dock != null) {
+ int result = ActivityManagerNative.getDefault()
+ .startActivity(null, dock,
+ dock.resolveTypeIfNeeded(mContext.getContentResolver()),
+ null, 0, null, null, 0, true /* onlyIfNeeded*/, false);
+ if (result == IActivityManager.START_RETURN_INTENT_TO_CALLER) {
+ return false;
+ }
}
}
int result = ActivityManagerNative.getDefault()