Merge "Rename listener to callback for ConferenceManager and rename strings 2/4" into lmp-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c1bd87c..743f67c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -173,7 +173,7 @@
android:targetActivity="CallActivity"
android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.INCOMING_CALL" />
+ <action android:name="android.telecomm.action.INCOMING_CALL" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity-alias>
diff --git a/tests/src/com/android/telecomm/testapps/TestConnectionManager.java b/tests/src/com/android/telecomm/testapps/TestConnectionManager.java
index 78c148d..725549f 100644
--- a/tests/src/com/android/telecomm/testapps/TestConnectionManager.java
+++ b/tests/src/com/android/telecomm/testapps/TestConnectionManager.java
@@ -189,7 +189,7 @@
}
public final class TestManagedConference extends Conference {
- private final RemoteConference.Listener mRemoteListener = new RemoteConference.Listener() {
+ private final RemoteConference.Callback mRemoteCallback = new RemoteConference.Callback() {
@Override
public void onStateChanged(RemoteConference conference, int oldState, int newState) {
switch (newState) {
@@ -245,7 +245,7 @@
@Override
public void onDestroyed(RemoteConference conference) {
destroy();
- mRemote.removeListener(mRemoteListener);
+ mRemote.removeCallback(mRemoteCallback);
mManagedConferenceByRemote.remove(mRemote);
}
};
@@ -255,7 +255,7 @@
public TestManagedConference(RemoteConference remote) {
super(null);
mRemote = remote;
- remote.addListener(mRemoteListener);
+ remote.addCallback(mRemoteCallback);
setActive();
for (RemoteConnection r : remote.getConnections()) {
TestManagedConnection c = mManagedConnectionByRemote.get(r);