Further cleanup, and move functionality into TestFixture objects
Change-Id: I62b514ae8fe10f720a60c681968efd2340616eba
diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java
index 149ffe9..daedb91 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -63,7 +63,7 @@
* connected etc).
*/
@VisibleForTesting
-final public class Call implements CreateConnectionResponse {
+public class Call implements CreateConnectionResponse {
/**
* Listener for events on the call.
*/
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index 52dd55d..8e5927d 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -56,7 +56,8 @@
* access from other packages specifically refraining from passing the CallsManager instance
* beyond the com.android.server.telecom package boundary.
*/
-public final class CallsManager extends Call.ListenerBase {
+@VisibleForTesting
+public class CallsManager extends Call.ListenerBase {
// TODO: Consider renaming this CallsManagerPlugin.
interface CallsManagerListener {
diff --git a/src/com/android/server/telecom/HeadsetMediaButton.java b/src/com/android/server/telecom/HeadsetMediaButton.java
index 8c1488c..5d55edd 100644
--- a/src/com/android/server/telecom/HeadsetMediaButton.java
+++ b/src/com/android/server/telecom/HeadsetMediaButton.java
@@ -16,6 +16,7 @@
package com.android.server.telecom;
+import android.annotation.TargetApi;
import android.content.Context;
import android.content.Intent;
import android.media.AudioAttributes;
diff --git a/src/com/android/server/telecom/Log.java b/src/com/android/server/telecom/Log.java
index 451e86d..b9ad73d 100644
--- a/src/com/android/server/telecom/Log.java
+++ b/src/com/android/server/telecom/Log.java
@@ -34,7 +34,8 @@
public class Log {
// Generic tag for all In Call logging
- private static String TAG = "Telecom";
+ @VisibleForTesting
+ public static String TAG = "Telecom";
public static final boolean FORCE_LOGGING = false; /* STOP SHIP if true */
public static final boolean SYSTRACE_DEBUG = false; /* STOP SHIP if true */
diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index b7b1500..4e8b47a 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -27,10 +27,7 @@
import android.net.Uri;
import android.os.Binder;
import android.os.Bundle;
-import android.os.Handler;
import android.os.IBinder;
-import android.os.Looper;
-import android.os.Message;
import android.os.UserHandle;
import android.os.UserManager;
import android.telecom.CallState;
@@ -725,7 +722,7 @@
mPhoneAccountRegistrar = phoneAccountRegistrar;
}
- public IBinder getBinder() {
+ public ITelecomService.Stub getBinder() {
return mBinderImpl;
}