diff options
| author | Wink Saville <wink@google.com> | 2010-02-12 16:02:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-12 16:02:27 -0800 |
| commit | d13e213396051cab824f405c80d4988fa049952e (patch) | |
| tree | 869bed836d2214834419b292fc6a78a023a78db4 /policy/com | |
| parent | c33cb7117e64b93609ceb60d911bad6add09aa09 (diff) | |
| parent | 72c94b9f386909ebc9b3a7b3af8c64331ce7e10a (diff) | |
| download | frameworks_base-d13e213396051cab824f405c80d4988fa049952e.zip frameworks_base-d13e213396051cab824f405c80d4988fa049952e.tar.gz frameworks_base-d13e213396051cab824f405c80d4988fa049952e.tar.bz2 | |
am 79484171: am f010b5d2: Change EndCallBehavior while in UTS test mode.
Merge commit '794841710d11f59fd1736d1c889cc9b91f38f78e'
* commit '794841710d11f59fd1736d1c889cc9b91f38f78e':
Change EndCallBehavior while in UTS test mode.
Diffstat (limited to 'policy/com')
| -rwxr-xr-x | policy/com/android/internal/policy/impl/PhoneWindowManager.java | 25 |
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 c879ece..ba5ea74 100755 --- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2339,16 +2339,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() |