!2123 IPCcode接口格式修改

Merge pull request !2123 from zhaohaoran09/master

device_info/device_info_proxy.cpp

@@ -44,7 +44,8 @@ int32_t DeviceInfoProxy::GetUdid(std::string& result)
     MessageParcel reply;
     MessageOption option { MessageOption::TF_SYNC };
     data.WriteInterfaceToken(DeviceInfoProxy::GetDescriptor());
-    int32_t ret = DeviceInfoSendRequest(static_cast<uint32_t> (DeviceInfoInterfaceCode::COMMAND_GET_UDID), data, reply, option);
+    int32_t ret = DeviceInfoSendRequest(static_cast<uint32_t> (DeviceInfoInterfaceCode::COMMAND_GET_UDID),
+        data, reply, option);
     DINFO_LOGI("DeviceInfoProxy::GetUdid: %d", ret);
     DINFO_CHECK(ret == ERR_NONE, return ret, "getUdid failed, error code is %d", ret);
     result = Str16ToStr8(reply.ReadString16());
@@ -58,7 +59,8 @@ int32_t DeviceInfoProxy::GetSerialID(std::string& result)
     MessageOption option { MessageOption::TF_SYNC };
 
     data.WriteInterfaceToken(DeviceInfoProxy::GetDescriptor());
-    int32_t ret = DeviceInfoSendRequest(static_cast<uint32_t> (DeviceInfoInterfaceCode::COMMAND_GET_SERIAL_ID), data, reply, option);
+    int32_t ret = DeviceInfoSendRequest(static_cast<uint32_t> (DeviceInfoInterfaceCode::COMMAND_GET_SERIAL_ID),
+        data, reply, option);
     DINFO_LOGI("DeviceInfoProxy::GetSerialID: %d", ret);
     DINFO_CHECK(ret == ERR_NONE, return ret, "GetSerial failed, error code is %d", ret);
     result = Str16ToStr8(reply.ReadString16());

device_info/deviceinfoservice_ipc_interface_code.h

@@ -16,12 +16,12 @@
 #ifndef DEVICEINFOSERVICE_IPC_INTERFACE_CODE_H
 #define DEVICEINFOSERVICE_IPC_INTERFACE_CODE_H
  
-/*SAID: 3902 */
+/* SAID: 3902 */
 namespace OHOS {
 namespace device_info {
 enum class DeviceInfoInterfaceCode {
-	COMMAND_GET_UDID = 1,
-	COMMAND_GET_SERIAL_ID = 2,
+    COMMAND_GET_UDID = 1,
+    COMMAND_GET_SERIAL_ID = 2,
 };
 } // namespace device_info
 } // namespace OHOS

services/param/watcher/agent/watcher_manager_proxy.cpp

@@ -29,7 +29,8 @@ uint32_t WatcherManagerProxy::AddRemoteWatcher(uint32_t id, const sptr<IWatcher>
 
     MessageParcel reply;
     MessageOption option { MessageOption::TF_SYNC };
-    int32_t res = SendWatcherMsg(static_cast<uint32_t>(ParamWatcherInterfaceCode::ADD_REMOTE_AGENT), data, reply, option);
+    int32_t res = SendWatcherMsg(static_cast<uint32_t>(ParamWatcherInterfaceCode::ADD_REMOTE_AGENT),
+        data, reply, option);
     WATCHER_CHECK(res == ERR_OK, return 0, "Transact error %d", res);
     return reply.ReadUint32();
 }
@@ -41,7 +42,8 @@ int32_t WatcherManagerProxy::DelRemoteWatcher(uint32_t remoteWatcherId)
     data.WriteUint32(remoteWatcherId);
     MessageParcel reply;
     MessageOption option { MessageOption::TF_SYNC };
-    int32_t res = SendWatcherMsg(static_cast<uint32_t>(ParamWatcherInterfaceCode::DEL_REMOTE_AGENT), data, reply, option);
+    int32_t res = SendWatcherMsg(static_cast<uint32_t>(ParamWatcherInterfaceCode::DEL_REMOTE_AGENT),
+        data, reply, option);
     WATCHER_CHECK(res == ERR_OK, return ERR_FLATTEN_OBJECT, "Transact error");
     return reply.ReadInt32();
 }

services/param/watcher/include/param_watcher_ipc_interface_code.h

@@ -16,15 +16,15 @@
 #ifndef PARAM_WATCHER_IPC_INTERFACE_CODE_H
 #define PARAM_WATCHER_IPC_INTERFACE_CODE_H
  
-/*SAID: 3901 */
+/* SAID: 3901 */
 namespace OHOS {
 namespace init_param {
 enum class ParamWatcherInterfaceCode {
-	ADD_WATCHER = 0,
-	DEL_WATCHER,
-	ADD_REMOTE_AGENT,
-	DEL_REMOTE_AGENT,
-	REFRESH_WATCHER
+    ADD_WATCHER = 0,
+    DEL_WATCHER,
+    ADD_REMOTE_AGENT,
+    DEL_REMOTE_AGENT,
+    REFRESH_WATCHER
 };
 } // namespace init_param
 } // namespace OHOS

test/unittest/deviceinfo/DeviceInfoUnittest.cpp

@@ -126,7 +126,8 @@ HWTEST_F(DeviceInfoUnittest, DeviceInfoServiceInvalidTokenTest, TestSize.Level1)
     MessageOption option;
     g_tokenType = OHOS::Security::AccessToken::TOKEN_INVALID;
     data.WriteInterfaceToken(OHOS::device_info::DeviceInfoStub::GetDescriptor());
-    deviceInfoService->OnRemoteRequest(static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_UDID), data, reply, option);
+    deviceInfoService->OnRemoteRequest
+        (static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_UDID), data, reply, option);
 }
 
 HWTEST_F(DeviceInfoUnittest, DeviceInfoServiceFailTest, TestSize.Level1)
@@ -142,10 +143,14 @@ HWTEST_F(DeviceInfoUnittest, DeviceInfoServiceFailTest, TestSize.Level1)
 
     // udid
     data.WriteInterfaceToken(OHOS::device_info::DeviceInfoStub::GetDescriptor());
-    deviceInfoService->OnRemoteRequest(static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_UDID), data, reply, option);
+    deviceInfoService->OnRemoteRequest
+        (static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_UDID),
+        data, reply, option);
     // serial
     data.WriteInterfaceToken(OHOS::device_info::DeviceInfoStub::GetDescriptor());
-    deviceInfoService->OnRemoteRequest(static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_SERIAL_ID), data, reply, option);
+    deviceInfoService->OnRemoteRequest
+        (static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_SERIAL_ID),
+        data, reply, option);
 }
 
 HWTEST_F(DeviceInfoUnittest, DeviceInfoServiceTest, TestSize.Level1)
@@ -159,13 +164,21 @@ HWTEST_F(DeviceInfoUnittest, DeviceInfoServiceTest, TestSize.Level1)
     g_tokenType = OHOS::Security::AccessToken::TOKEN_HAP;
     g_tokenVerifyResult = OHOS::Security::AccessToken::TypePermissionState::PERMISSION_GRANTED;
     data.WriteInterfaceToken(OHOS::device_info::DeviceInfoStub::GetDescriptor());
-    deviceInfoService->OnRemoteRequest(static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_UDID), data, reply, option);
+    deviceInfoService->OnRemoteRequest
+        (static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_UDID),
+        data, reply, option);
     data.WriteInterfaceToken(OHOS::device_info::DeviceInfoStub::GetDescriptor());
-    deviceInfoService->OnRemoteRequest(static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_SERIAL_ID), data, reply, option);
+    deviceInfoService->OnRemoteRequest
+        (static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_SERIAL_ID),
+        data, reply, option);
     data.WriteInterfaceToken(OHOS::device_info::DeviceInfoStub::GetDescriptor());
-    deviceInfoService->OnRemoteRequest(static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_SERIAL_ID) + 1, data, reply, option);
+    deviceInfoService->OnRemoteRequest
+        (static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_SERIAL_ID) + 1,
+        data, reply, option);
 
-    deviceInfoService->OnRemoteRequest(static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_SERIAL_ID) + 1, data, reply, option);
+    deviceInfoService->OnRemoteRequest
+        (static_cast<uint32_t> (OHOS::device_info::DeviceInfoInterfaceCode::COMMAND_GET_SERIAL_ID) + 1,
+        data, reply, option);
     std::this_thread::sleep_for(std::chrono::seconds(3)); // wait sa unload 3s
     deviceInfoService->GetUdid(result);
     deviceInfoService->GetSerialID(result);

test/unittest/param/watcher_proxy_unittest.cpp

@@ -78,7 +78,8 @@ public:
         bool ret = data.WriteRemoteObject(watcher->AsObject());
         WATCHER_CHECK(ret, return 0, "Can not get remote");
         data.WriteUint32(agentId);
-        watcherManager->OnRemoteRequest(static_cast<uint32_t>(ParamWatcherInterfaceCode::ADD_REMOTE_AGENT), data, reply, option);
+        watcherManager->OnRemoteRequest(
+            static_cast<uint32_t> (ParamWatcherInterfaceCode::ADD_REMOTE_AGENT), data, reply, option);
         watcherId = reply.ReadUint32();
         EXPECT_NE(watcherId, 0);
 
@@ -101,7 +102,8 @@ public:
 
         data.WriteInterfaceToken(IWatcherManager::GetDescriptor());
         data.WriteUint32(watcherId);
-        watcherManager->OnRemoteRequest(static_cast<uint32_t>(ParamWatcherInterfaceCode::DEL_REMOTE_AGENT), data, reply, option);
+        watcherManager->OnRemoteRequest(
+            static_cast<uint32_t> (ParamWatcherInterfaceCode::DEL_REMOTE_AGENT), data, reply, option);
         EXPECT_EQ(reply.ReadInt32(), 0);
         EXPECT_EQ(watcherManager->GetRemoteWatcher(watcherId) == nullptr, 1);
         return 0;
@@ -118,7 +120,8 @@ public:
         data.WriteInterfaceToken(IWatcherManager::GetDescriptor());
         data.WriteString(keyPrefix);
         data.WriteUint32(watcherId);
-        watcherManager->OnRemoteRequest(static_cast<uint32_t>(ParamWatcherInterfaceCode::ADD_WATCHER), data, reply, option);
+        watcherManager->OnRemoteRequest(
+            static_cast<uint32_t> (ParamWatcherInterfaceCode::ADD_WATCHER), data, reply, option);
         EXPECT_EQ(reply.ReadInt32(), 0);
         EXPECT_EQ(watcherManager->GetWatcherGroup(keyPrefix) != nullptr, 1);
         return 0;
@@ -135,7 +138,8 @@ public:
         data.WriteInterfaceToken(IWatcherManager::GetDescriptor());
         data.WriteString(keyPrefix);
         data.WriteUint32(watcherId);
-        watcherManager->OnRemoteRequest(static_cast<uint32_t>(ParamWatcherInterfaceCode::REFRESH_WATCHER), data, reply, option);
+        watcherManager->OnRemoteRequest(
+            static_cast<uint32_t> (ParamWatcherInterfaceCode::REFRESH_WATCHER), data, reply, option);
         EXPECT_EQ(reply.ReadInt32(), 0);
         EXPECT_EQ(watcherManager->GetWatcherGroup(keyPrefix) != nullptr, 1);
         return 0;
@@ -151,7 +155,8 @@ public:
         data.WriteInterfaceToken(IWatcherManager::GetDescriptor());
         data.WriteString(keyPrefix);
         data.WriteUint32(watcherId);
-        watcherManager->OnRemoteRequest(static_cast<uint32_t>(ParamWatcherInterfaceCode::DEL_WATCHER), data, reply, option);
+        watcherManager->OnRemoteRequest(
+            static_cast<uint32_t> (ParamWatcherInterfaceCode::DEL_WATCHER), data, reply, option);
         EXPECT_EQ(reply.ReadInt32(), 0);
         return 0;
     }
@@ -231,11 +236,13 @@ public:
         data.WriteInterfaceToken(IWatcherManager::GetDescriptor());
         data.WriteString(keyPrefix);
         data.WriteUint32(0);
-        watcherManager->OnRemoteRequest(static_cast<uint32_t>(ParamWatcherInterfaceCode::REFRESH_WATCHER) + 1, data, reply, option);
+        watcherManager->OnRemoteRequest(
+            static_cast<uint32_t> (ParamWatcherInterfaceCode::REFRESH_WATCHER) + 1, data, reply, option);
 
         data.WriteInterfaceToken(IWatcherManager::GetDescriptor());
         data.WriteString(keyPrefix);
-        watcherManager->OnRemoteRequest(static_cast<uint32_t>(ParamWatcherInterfaceCode::REFRESH_WATCHER) + 1, data, reply, option);
+        watcherManager->OnRemoteRequest(
+            static_cast<uint32_t> (ParamWatcherInterfaceCode::REFRESH_WATCHER) + 1, data, reply, option);
         return 0;
     }