summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/answerproximitysensor
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2017-06-20 11:23:41 -0700
committerEric Erfanian <erfanian@google.com>2017-06-21 18:16:03 +0000
commit5b4becb8ca9cc6249d0cf0a074bf63d6999f3b5e (patch)
tree9ced1a3f07598cfb65cc3226368ba5321ee10107 /java/com/android/incallui/answerproximitysensor
parentf0a8ccfcd370d26b3887fc8428dedf5596f42ca8 (diff)
Automated g4 rollback of changelist 158923709.
*** Reason for rollback *** It's not necessary anymore after we verified it could be controlled from server side. *** Original change description *** Flip flag to enable ReturnToCall bubble. Enables ReturnToCall bubble and changes the name of the flag so that it can be toggled independently from previous versions. *** Also in the change: Restore TODOs Test: TH PiperOrigin-RevId: 159587541 Change-Id: I88f01550f07a7859f41b4f0fc843e92b38f5a85b
Diffstat (limited to 'java/com/android/incallui/answerproximitysensor')
-rw-r--r--java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java
index 536a470b0..16fad8b17 100644
--- a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java
+++ b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java
@@ -80,7 +80,7 @@ public class AnswerProximitySensor
.getBoolean(CONFIG_ANSWER_PSEUDO_PROXIMITY_WAKE_LOCK_ENABLED, true)) {
answerProximityWakeLock = new PseudoProximityWakeLock(context, pseudoScreenState);
} else {
- // TODO: choose a wake lock implementation base on framework/device.
+ // TODO(twyen): choose a wake lock implementation base on framework/device.
// These bugs requires the PseudoProximityWakeLock workaround:
// b/30439151 Proximity sensor not working on M
// b/31499931 fautly touch input when screen is off on marlin/sailfish