diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-12-03 02:51:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 02:51:46 +0000 |
| commit | a3e39d9989c6bfede80e31be8dc89678ea24d2cb (patch) | |
| tree | 5b97a837dc33db7bb35bc6e85f606e7180b1284e /InCallUI/src | |
| parent | 96a255d8e4e6db9118f96b25efb8f31d5e0127e5 (diff) | |
| parent | 41f6408d07d3374832df32f1e12006fd05b2527e (diff) | |
am 1e739f45: am bf4c6389: Merge "Add some more logging in InCallActivity and InCallPresenter" into lmp-mr1-dev
* commit '1e739f457d7283824ee0d2b72730a84e33b8dd67':
Add some more logging in InCallActivity and InCallPresenter
Diffstat (limited to 'InCallUI/src')
| -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 |