diff options
| author | Wink Saville <wink@google.com> | 2010-02-12 15:57:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-12 15:57:25 -0800 |
| commit | 794841710d11f59fd1736d1c889cc9b91f38f78e (patch) | |
| tree | 3016bc6a6501575afdfbae447e57f59d60f5a8bf | |
| parent | c5908853dfd8ea68e81a17e4d57b1fdf76349373 (diff) | |
| parent | f010b5d26f1e1c93b93576995e76ffd63db2f96e (diff) | |
| download | base-794841710d11f59fd1736d1c889cc9b91f38f78e.tar.gz | |
am f010b5d2: Change EndCallBehavior while in UTS test mode.
Merge commit 'f010b5d26f1e1c93b93576995e76ffd63db2f96e' into eclair-plus-aosp
* commit 'f010b5d26f1e1c93b93576995e76ffd63db2f96e':
Change EndCallBehavior while in UTS test mode.
| -rwxr-xr-x | phone/com/android/internal/policy/impl/PhoneWindowManager.java | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/phone/com/android/internal/policy/impl/PhoneWindowManager.java b/phone/com/android/internal/policy/impl/PhoneWindowManager.java index 30f0d2d..21736d5 100755 --- a/phone/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/phone/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() |