Merge "rcs_aosp: aosp code submission for patch set6"
diff --git a/rcs_service_aidl/src/com/suntek/mway/rcs/client/aidl/im/OprResponse.java b/rcs_service_aidl/src/com/suntek/mway/rcs/client/aidl/im/OprResponse.java
new file mode 100644
index 0000000..3400cce
--- /dev/null
+++ b/rcs_service_aidl/src/com/suntek/mway/rcs/client/aidl/im/OprResponse.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2015 pci-suntektech Technologies, Inc. All Rights Reserved.
+ * pci-suntektech Technologies Proprietary and Confidential.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+package com.suntek.mway.rcs.client.aidl.im;
+
+public class OprResponse {
+
+ public static final int SUCCESS = 200;
+
+ public static final int OFFLINE = 900;
+
+ public static final int OTHRE_ERROR = 999;
+
+}
diff --git a/rcs_service_aidl/src/com/suntek/mway/rcs/client/aidl/plugin/callback/PublicAccountCallback.java b/rcs_service_aidl/src/com/suntek/mway/rcs/client/aidl/plugin/callback/PublicAccountCallback.java
new file mode 100644
index 0000000..2a39fda
--- /dev/null
+++ b/rcs_service_aidl/src/com/suntek/mway/rcs/client/aidl/plugin/callback/PublicAccountCallback.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2015 pci-suntektech Technologies, Inc. All Rights Reserved.
+ * pci-suntektech Technologies Proprietary and Confidential.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+package com.suntek.mway.rcs.client.aidl.plugin.callback;
+
+import com.suntek.mway.rcs.client.aidl.plugin.callback.IPublicAccountCallbackAPI;
+import com.suntek.mway.rcs.client.aidl.plugin.entity.pubacct.MenuInfoMode;
+import com.suntek.mway.rcs.client.aidl.plugin.entity.pubacct.MsgContent;
+import com.suntek.mway.rcs.client.aidl.plugin.entity.pubacct.PublicAccounts;
+import com.suntek.mway.rcs.client.aidl.plugin.entity.pubacct.PublicAccountsDetail;
+
+import android.os.RemoteException;
+
+import java.util.List;
+
+public abstract class PublicAccountCallback extends IPublicAccountCallbackAPI.Stub{
+
+
+// public void PublicAccountCallback() {
+//
+// }
+// @Override
+// public void respAddSubscribe(boolean arg0) throws RemoteException {
+// // TODO Auto-generated method stub
+//
+// }
+
+ @Override
+ public void respAddSubscribeAccount(boolean arg0, PublicAccounts arg1)
+ throws RemoteException {
+ // TODO Auto-generated method stub
+
+ }
+
+// @Override
+// public void respCancelSubscribe(boolean arg0) throws RemoteException {
+// // TODO Auto-generated method stub
+//
+// }
+
+ @Override
+ public void respCancelSubscribeAccount(boolean arg0, PublicAccounts arg1)
+ throws RemoteException {
+ // TODO Auto-generated method stub
+
+ }
+
+// @Override
+// public void respComplainPublic(boolean result) throws RemoteException {
+// // TODO Auto-generated method stub
+// LogHelper.d("result --> "+result );
+// }
+
+ @Override
+ public void respComplainPublicAccount(boolean result, PublicAccounts arg1)
+ throws RemoteException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void respGetPreMessage(boolean arg0, List<MsgContent> arg1)
+ throws RemoteException {
+ // TODO Auto-generated method stub
+
+ }
+
+// @Override
+// public void respGetPreMessageAccount(boolean result, PublicAccounts pAccount)
+// throws RemoteException {
+// // TODO Auto-generated method stub
+// LogHelper.d("result --> "+result + "PublicAccounts = " + pAccount.getPaUuid()+" , "+pAccount.getSipUri());
+// }
+
+ @Override
+ public void respGetPublicDetail(boolean arg0, PublicAccountsDetail arg1)
+ throws RemoteException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void respGetPublicList(boolean arg0, List<PublicAccounts> arg1)
+ throws RemoteException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void respGetPublicMenuInfo(boolean result, MenuInfoMode menuInfoMode)
+ throws RemoteException {
+ // TODO Auto-generated method stub
+
+ }
+
+// @Override
+// public void respGetPublicMenuInfoAccount(boolean result, PublicAccounts pAccount)
+// throws RemoteException {
+// // TODO Auto-generated method stub
+// LogHelper.d("result --> "+result + "PublicAccounts = " + pAccount.getPaUuid()+" , "+pAccount.getSipUri());
+//
+// }
+
+// @Override
+// public void respGetPublicMenuInfoString(boolean result, String info)
+// throws RemoteException {
+// // TODO Auto-generated method stub
+// LogHelper.d("result --> "+result + "info = " + info);
+//
+// }
+
+ @Override
+ public void respGetUserSubscribePublicList(boolean result,
+ List<PublicAccounts> pubAcctList) throws RemoteException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void respGetPublicRecommend(boolean arg0, List<PublicAccounts> arg1)
+ throws RemoteException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void respSetAcceptStatus(boolean result, String uuid)
+ throws RemoteException {
+ // TODO Auto-generated method stub
+
+ }
+}