From 5b4becb8ca9cc6249d0cf0a074bf63d6999f3b5e Mon Sep 17 00:00:00 2001 From: wangqi Date: Tue, 20 Jun 2017 11:23:41 -0700 Subject: 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 --- .../android/incallui/answerproximitysensor/AnswerProximitySensor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/com/android/incallui/answerproximitysensor') 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 -- cgit v1.2.3