Merge "Move RCS APIs to android.telephony.ims"
diff --git a/src/java/com/android/internal/telephony/RcsController.java b/src/java/com/android/internal/telephony/RcsMessageStoreController.java
similarity index 72%
rename from src/java/com/android/internal/telephony/RcsController.java
rename to src/java/com/android/internal/telephony/RcsMessageStoreController.java
index e04b4b6..c2edd95 100644
--- a/src/java/com/android/internal/telephony/RcsController.java
+++ b/src/java/com/android/internal/telephony/RcsMessageStoreController.java
@@ -19,25 +19,26 @@
import android.content.Context;
import android.os.ServiceManager;
import android.telephony.Rlog;
-import android.telephony.rcs.RcsManager;
+import android.telephony.ims.RcsMessageStore;
+import android.telephony.ims.aidl.IRcs;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.telephony.rcs.IRcs;
-/** Backing implementation of {@link RcsManager}. */
-public class RcsController extends IRcs.Stub {
- private static final String TAG = "RcsController";
+
+/** Backing implementation of {@link RcsMessageStore}. */
+public class RcsMessageStoreController extends IRcs.Stub {
+ private static final String TAG = "RcsMessageStoreController";
private static final String RCS_SERVICE_NAME = "ircs";
- private static RcsController sInstance;
+ private static RcsMessageStoreController sInstance;
private final Context mContext;
/** Initialize the instance. Should only be called once. */
- public static RcsController init(Context context) {
- synchronized (RcsController.class) {
+ public static RcsMessageStoreController init(Context context) {
+ synchronized (RcsMessageStoreController.class) {
if (sInstance == null) {
- sInstance = new RcsController(context);
+ sInstance = new RcsMessageStoreController(context);
} else {
Rlog.e(TAG, "init() called multiple times! sInstance = " + sInstance);
}
@@ -45,7 +46,7 @@
return sInstance;
}
- private RcsController(Context context) {
+ private RcsMessageStoreController(Context context) {
mContext = context;
if (ServiceManager.getService(RCS_SERVICE_NAME) == null) {
ServiceManager.addService(RCS_SERVICE_NAME, this);
@@ -53,7 +54,7 @@
}
@VisibleForTesting
- public RcsController(Context context, Void unused) {
+ public RcsMessageStoreController(Context context, Void unused) {
mContext = context;
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/rcs/RcsControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/rcs/RcsMessageStoreControllerTest.java
similarity index 73%
rename from tests/telephonytests/src/com/android/internal/telephony/rcs/RcsControllerTest.java
rename to tests/telephonytests/src/com/android/internal/telephony/rcs/RcsMessageStoreControllerTest.java
index d80b94b..869ec84 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/rcs/RcsControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/rcs/RcsMessageStoreControllerTest.java
@@ -18,19 +18,19 @@
import static org.junit.Assert.assertEquals;
-import com.android.internal.telephony.RcsController;
+import com.android.internal.telephony.RcsMessageStoreController;
import com.android.internal.telephony.TelephonyTest;
import org.junit.Before;
import org.junit.Test;
-public class RcsControllerTest extends TelephonyTest {
+public class RcsMessageStoreControllerTest extends TelephonyTest {
- private RcsController mRcsController;
+ private RcsMessageStoreController mRcsMessageStoreController;
@Before
public void setUp() {
- mRcsController = new RcsController(mContext, null);
+ mRcsMessageStoreController = new RcsMessageStoreController(mContext, null);
}
/**
@@ -38,6 +38,6 @@
*/
@Test
public void testGetMessageCount() {
- assertEquals(1018, mRcsController.getMessageCount(0));
+ assertEquals(1018, mRcsMessageStoreController.getMessageCount(0));
}
}
