am 79484171: am f010b5d2: Change EndCallBehavior while in UTS test mode.
Merge commit '794841710d11f59fd1736d1c889cc9b91f38f78e'
* commit '794841710d11f59fd1736d1c889cc9b91f38f78e':
Change EndCallBehavior while in UTS test mode.
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 @@
// 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()