summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/InCallServiceImpl.java
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2017-06-09 14:16:05 +0000
committerTobias Thierer <tobiast@google.com>2017-06-09 14:16:05 +0000
commitcded3beaf28a703e1ef8f71bbc6836e6806c3736 (patch)
treec1b5e8199b5996fc848e7455d04126b9cdbb3c39 /java/com/android/incallui/InCallServiceImpl.java
parentc67d658e7daa453fe9ad9fd1a37f81eaf2048c44 (diff)
Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47"
This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44. Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master. Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b
Diffstat (limited to 'java/com/android/incallui/InCallServiceImpl.java')
-rw-r--r--java/com/android/incallui/InCallServiceImpl.java10
1 files changed, 0 insertions, 10 deletions
diff --git a/java/com/android/incallui/InCallServiceImpl.java b/java/com/android/incallui/InCallServiceImpl.java
index 1653334a1..4ab92a797 100644
--- a/java/com/android/incallui/InCallServiceImpl.java
+++ b/java/com/android/incallui/InCallServiceImpl.java
@@ -23,7 +23,6 @@ import android.telecom.Call;
import android.telecom.CallAudioState;
import android.telecom.InCallService;
import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
-import com.android.dialer.common.ConfigProviderBindings;
import com.android.incallui.audiomode.AudioModeProvider;
import com.android.incallui.call.CallList;
import com.android.incallui.call.ExternalCallList;
@@ -37,8 +36,6 @@ import com.android.incallui.call.TelecomAdapter;
*/
public class InCallServiceImpl extends InCallService {
- private ReturnToCallController returnToCallController;
-
@Override
public void onCallAudioStateChanged(CallAudioState audioState) {
AudioModeProvider.getInstance().onAudioStateChanged(audioState);
@@ -82,9 +79,6 @@ public class InCallServiceImpl extends InCallService {
InCallPresenter.getInstance().onServiceBind();
InCallPresenter.getInstance().maybeStartRevealAnimation(intent);
TelecomAdapter.getInstance().setInCallService(this);
- if (ConfigProviderBindings.get(this).getBoolean("enable_return_to_call_bubble", false)) {
- returnToCallController = new ReturnToCallController(this);
- }
return super.onBind(intent);
}
@@ -104,9 +98,5 @@ public class InCallServiceImpl extends InCallService {
// Tear down the InCall system
TelecomAdapter.getInstance().clearInCallService();
InCallPresenter.getInstance().tearDown();
- if (returnToCallController != null) {
- returnToCallController.tearDown();
- returnToCallController = null;
- }
}
}