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 | 3abd5457303e9451714e4d4ad3c7e0df424e4564 (patch) | |
| tree | 6db9ee2b0906f2abc63782ffde61fcb29ff3c81e /InCallUI | |
| parent | 10f63a9e5ee4e53eee6d050e53b9c52a328a7c1a (diff) | |
| parent | 9aa0cae59f741524285391fa6877252f6ade76ec (diff) | |
Merge "Add some more logging in InCallActivity and InCallPresenter" into lmp-mr1-dev
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 2 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index 3f9cd9827..e94a2dcad 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/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/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index 858f2136f..72d45893c 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/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 |