diff --git a/frameworks/ans/src/notification_request.cpp b/frameworks/ans/src/notification_request.cpp index 5f4251e147de8d490822f6dd01ac7e472034244e..d9c8350ac37d4eba8526deb5f413713b19fc0520 100644 --- a/frameworks/ans/src/notification_request.cpp +++ b/frameworks/ans/src/notification_request.cpp @@ -1362,6 +1362,7 @@ bool NotificationRequest::ReadFromParcel(Parcel &parcel) for (uint64_t it = 0; it < vsize; ++it) { auto member = parcel.ReadParcelable(); if (member == nullptr) { + actionButtons_.clear(); ANS_LOGE("Failed to read actionButton"); return false; } diff --git a/frameworks/ans/test/unittest/notification_content_test.cpp b/frameworks/ans/test/unittest/notification_content_test.cpp index e8e582546f6639e058516909c23501bb68cb994d..d13b0ee725441401d3aadbde4072402a8d69e94d 100644 --- a/frameworks/ans/test/unittest/notification_content_test.cpp +++ b/frameworks/ans/test/unittest/notification_content_test.cpp @@ -365,7 +365,7 @@ HWTEST_F(NotificationContentTest, NotificationBasicContentReadFromJson_00001, Le { auto notificationBasicContent = std::make_shared(); nlohmann::json jsonObject = nlohmann::json{ - {"text", "test"}, + {"text", "test"}, {"title", "test"}, {"additionalText", "test"}}; notificationBasicContent->ReadFromJson(jsonObject); diff --git a/frameworks/ans/test/unittest/notification_conversational_message_test.cpp b/frameworks/ans/test/unittest/notification_conversational_message_test.cpp index a946df012b070b76dbfd3b14965fa40891355253..e0ce4d88ed3b7cb64fe89d176c21752d8220c76a 100644 --- a/frameworks/ans/test/unittest/notification_conversational_message_test.cpp +++ b/frameworks/ans/test/unittest/notification_conversational_message_test.cpp @@ -253,7 +253,5 @@ HWTEST_F(NotificationConversationalMessageTest, FromJson_00004, Function | Small auto res = rrc->FromJson(jsonObject); EXPECT_NE(res, nullptr); } - - } } \ No newline at end of file diff --git a/frameworks/ans/test/unittest/notification_picture_content_test.cpp b/frameworks/ans/test/unittest/notification_picture_content_test.cpp index 4b394d60767198fea41a67e202af6563e5441667..2138d7d38450017eebf53f8f07ee5fb2ba929fa9 100644 --- a/frameworks/ans/test/unittest/notification_picture_content_test.cpp +++ b/frameworks/ans/test/unittest/notification_picture_content_test.cpp @@ -197,7 +197,7 @@ HWTEST_F(NotificationPictureContentTest, FromJson_00003, Function | SmallTest | nlohmann::json jsonObject = nlohmann::json{ {"expandedTitle", "title"}, - {"briefText", "test"}, + {"briefText", "test"}, {"bigPicture", "/data/image/1.jpeg"}}; auto res = rrc->FromJson(jsonObject); EXPECT_NE(res, nullptr); diff --git a/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/ServiceExtAbility/NotificationServiceExtAbility.ts b/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/ServiceExtAbility/NotificationServiceExtAbility.ts index 218d9b0dc2b5f3a0aa341fc2030976aa766d164f..30e1510ee6aaa35a1ea96823426d5382105dc080 100644 --- a/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/ServiceExtAbility/NotificationServiceExtAbility.ts +++ b/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/ServiceExtAbility/NotificationServiceExtAbility.ts @@ -19,16 +19,16 @@ import display from '@ohos.display'; const TAG = 'NotificationDialog_Service'; export default class NotificationDialogServiceExtensionAbility extends extension { - onCreate(want) { + onCreate(want): void { console.debug(TAG, "onCreate, want: " + JSON.stringify(want)); globalThis.notificationExtensionContext = this.context; - globalThis.closeDialog = () => { - console.info(TAG, 'click waiting for a response'); - globalThis.notificationExtensionContext.terminateSelf(); + globalThis.closeDialog = (): void => { + console.info(TAG, 'click waiting for a response'); + globalThis.notificationExtensionContext.terminateSelf(); } }; - onRequest(want, startId) { + onRequest(want, startId): void { globalThis.abilityWant = want; console.log(TAG, 'globalThis.resolution' + JSON.stringify(globalThis.resolution)); display.getDefaultDisplay().then(() => { @@ -36,7 +36,7 @@ export default class NotificationDialogServiceExtensionAbility extends extension }); } - onDestroy() { + onDestroy(): void { console.info(TAG, 'onDestroy.'); }