diff options
author | Yorke Lee <yorkelee@google.com> | 2014-12-03 00:09:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-03 00:09:31 +0000 |
commit | bf4c638976b6afd6a31926b0a9456bad18908ab8 (patch) | |
tree | 616c5498bcff63df802dea834b7297f329500753 | |
parent | fc4b5bf5e074b671ee2a4d3ffb794645efa7f321 (diff) | |
parent | 52c7d98be56b539725b7dc023711cb8656b715ae (diff) | |
download | packages_apps_InCallUI-bf4c638976b6afd6a31926b0a9456bad18908ab8.tar.gz packages_apps_InCallUI-bf4c638976b6afd6a31926b0a9456bad18908ab8.tar.bz2 packages_apps_InCallUI-bf4c638976b6afd6a31926b0a9456bad18908ab8.zip |
Merge "Add some more logging in InCallActivity and InCallPresenter" into lmp-mr1-dev
-rw-r--r-- | src/com/android/incallui/InCallActivity.java | 2 | ||||
-rw-r--r-- | src/com/android/incallui/InCallPresenter.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java index 3f9cd982..e94a2dca 100644 --- a/src/com/android/incallui/InCallActivity.java +++ b/src/com/android/incallui/InCallActivity.java @@ -314,7 +314,7 @@ public class InCallActivity extends Activity { @Override public void onBackPressed() { - Log.d(this, "onBackPressed()..."); + Log.i(this, "onBackPressed"); // BACK is also used to exit out of any "special modes" of the // in-call UI: diff --git a/src/com/android/incallui/InCallPresenter.java b/src/com/android/incallui/InCallPresenter.java index 858f2136..72d45893 100644 --- a/src/com/android/incallui/InCallPresenter.java +++ b/src/com/android/incallui/InCallPresenter.java @@ -979,6 +979,7 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener { if (isCallWaiting) { if (mProximitySensor.isScreenReallyOff() && isActivityStarted()) { + Log.i(this, "Restarting InCallActivity to turn screen on for call waiting"); mInCallActivity.finish(); // When the activity actually finishes, we will start it again if there are // any active calls, so we do not need to start it explicitly here. Note, we |