Merge "Move RCS APIs to android.telephony.ims" (cbe83727) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/RcsController.java→src/java/com/android/internal/telephony/RcsMessageStoreController.java

+12 −11

Original line number	Diff line number	Diff line
		@@ -19,25 +19,26 @@ package com.android.internal.telephony;
		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 @@ public class RcsController extends IRcs.Stub {
		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 @@ public class RcsController extends IRcs.Stub {
		}

		@VisibleForTesting
		public RcsController(Context context, Void unused) {
		public RcsMessageStoreController(Context context, Void unused) {
		mContext = context;
		}

tests/telephonytests/src/com/android/internal/telephony/rcs/RcsControllerTest.java→tests/telephonytests/src/com/android/internal/telephony/rcs/RcsMessageStoreControllerTest.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -18,19 +18,19 @@ package com.android.internal.telephony.rcs;

		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 @@ public class RcsControllerTest extends TelephonyTest {
		*/
		@Test
		public void testGetMessageCount() {
		assertEquals(1018, mRcsController.getMessageCount(0));
		assertEquals(1018, mRcsMessageStoreController.getMessageCount(0));
		}
		}