fix scId reuse problem

Signed-off-by: baoyang <baoyang9@huawei.com>
Change-Id: Iddb02f15ad950d9307c118e560b4453d48678af5

frameworks/inner_api/enhance_kits/test/unittest/src/sec_comp_enhance_test.cpp

@@ -69,7 +69,7 @@ void SecCompEnhanceTest::TearDown()
  * @tc.name: SetEnhanceCfg001
  * @tc.desc: test SetEnhanceCfg
  * @tc.type: FUNC
- * @tc.require: AR000HO9IN
+ * @tc.require:
  */
 HWTEST_F(SecCompEnhanceTest, SetEnhanceCfg001, TestSize.Level1)
 {
@@ -86,7 +86,7 @@ HWTEST_F(SecCompEnhanceTest, SetEnhanceCfg001, TestSize.Level1)
  * @tc.name: GetPoniterEventEnhanceData001
  * @tc.desc: test GetPoniterEventEnhanceData
  * @tc.type: FUNC
- * @tc.require: AR000HO9IN
+ * @tc.require:
  */
 HWTEST_F(SecCompEnhanceTest, GetPoniterEventEnhanceData001, TestSize.Level1)
 {

frameworks/inner_api/security_component/test/unittest/src/location_button_test.cpp

@@ -47,7 +47,7 @@ void LocationButtonTest::TearDown()
  * @tc.name: FromJson001
  * @tc.desc: Test LocationButton from json success
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, FromJson001, TestSize.Level1)
 {
@@ -64,7 +64,7 @@ HWTEST_F(LocationButtonTest, FromJson001, TestSize.Level1)
  * @tc.name: FromJson002
  * @tc.desc: Test empty LocationButton from json
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, FromJson002, TestSize.Level1)
 {
@@ -79,7 +79,7 @@ HWTEST_F(LocationButtonTest, FromJson002, TestSize.Level1)
  * @tc.name: FromJson003
  * @tc.desc: Test location button from wrong type json
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, FromJson003, TestSize.Level1)
 {
@@ -101,7 +101,7 @@ HWTEST_F(LocationButtonTest, FromJson003, TestSize.Level1)
  * @tc.name: FromJson004
  * @tc.desc: Test location button from wrong rect json
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, FromJson004, TestSize.Level1)
 {
@@ -138,7 +138,7 @@ HWTEST_F(LocationButtonTest, FromJson004, TestSize.Level1)
  * @tc.name: FromJson005
  * @tc.desc: Test location button from wrong rect json
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, FromJson005, TestSize.Level1)
 {
@@ -175,7 +175,7 @@ HWTEST_F(LocationButtonTest, FromJson005, TestSize.Level1)
  * @tc.name: FromJson006
  * @tc.desc: Test location button from wrong size json
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, FromJson006, TestSize.Level1)
 {
@@ -203,7 +203,7 @@ HWTEST_F(LocationButtonTest, FromJson006, TestSize.Level1)
  * @tc.name: FromJson007
  * @tc.desc: Test location button from wrong size json
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, FromJson007, TestSize.Level1)
 {
@@ -228,7 +228,7 @@ HWTEST_F(LocationButtonTest, FromJson007, TestSize.Level1)
  * @tc.name: FromJson008
  * @tc.desc: Test location button from wrong size json
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, FromJson008, TestSize.Level1)
 {
@@ -253,7 +253,7 @@ HWTEST_F(LocationButtonTest, FromJson008, TestSize.Level1)
  * @tc.name: FromJson009
  * @tc.desc: Test location button from wrong border and parent json
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, FromJson009, TestSize.Level1)
 {
@@ -280,7 +280,7 @@ HWTEST_F(LocationButtonTest, FromJson009, TestSize.Level1)
  * @tc.name: FromJson010
  * @tc.desc: Test location button from wrong type params json
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, FromJson010, TestSize.Level1)
 {
@@ -308,7 +308,7 @@ HWTEST_F(LocationButtonTest, FromJson010, TestSize.Level1)
  * @tc.name: FromJson011
  * @tc.desc: Test location button from wrong type params json
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, FromJson011, TestSize.Level1)
 {
@@ -336,7 +336,7 @@ HWTEST_F(LocationButtonTest, FromJson011, TestSize.Level1)
  * @tc.name: FromJson012
  * @tc.desc: Test location button from wrong value params json
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, FromJson012, TestSize.Level1)
 {
@@ -377,7 +377,7 @@ HWTEST_F(LocationButtonTest, FromJson012, TestSize.Level1)
  * @tc.name: ToJsonStr001
  * @tc.desc: Test ToJsonStr normal branch
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, ToJsonStr001, TestSize.Level1)
 {
@@ -395,7 +395,7 @@ HWTEST_F(LocationButtonTest, ToJsonStr001, TestSize.Level1)
  * @tc.name: CompareComponentBasicInfo001
  * @tc.desc: Test CompareComponentBasicInfo other is null
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, CompareComponentBasicInfo001, TestSize.Level1)
 {
@@ -410,7 +410,7 @@ HWTEST_F(LocationButtonTest, CompareComponentBasicInfo001, TestSize.Level1)
  * @tc.name: CompareLocationButton001
  * @tc.desc: Test LocationButton compare
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, CompareLocationButton001, TestSize.Level1)
 {
@@ -445,7 +445,7 @@ HWTEST_F(LocationButtonTest, CompareLocationButton001, TestSize.Level1)
  * @tc.name: CompareLocationButton002
  * @tc.desc: Test LocationButton compare
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, CompareLocationButton002, TestSize.Level1)
 {
@@ -512,7 +512,7 @@ HWTEST_F(LocationButtonTest, CompareLocationButton002, TestSize.Level1)
  * @tc.name: CompareLocationButton003
  * @tc.desc: Test LocationButton compare
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(LocationButtonTest, CompareLocationButton003, TestSize.Level1)
 {

frameworks/inner_api/security_component/test/unittest/src/paste_button_test.cpp

@@ -46,7 +46,7 @@ void PasteButtonTest::TearDown()
  * @tc.name: IsParamValid001
  * @tc.desc: Test paste button from wrong value params json
  * @tc.type: FUNC
- * @tc.require: AR000HO9JB
+ * @tc.require:
  */
 HWTEST_F(PasteButtonTest, IsParamValid001, TestSize.Level1)
 {
@@ -87,7 +87,7 @@ HWTEST_F(PasteButtonTest, IsParamValid001, TestSize.Level1)
  * @tc.name: ComparePasteButton001
  * @tc.desc: Test compare paste button
  * @tc.type: FUNC
- * @tc.require: AR000HO9JB
+ * @tc.require:
  */
 HWTEST_F(PasteButtonTest, ComparePasteButton001, TestSize.Level1)
 {
@@ -122,7 +122,7 @@ HWTEST_F(PasteButtonTest, ComparePasteButton001, TestSize.Level1)
  * @tc.name: ComparePasteButton002
  * @tc.desc: Test PasteButton compare
  * @tc.type: FUNC
- * @tc.require: AR000HO9JB
+ * @tc.require:
  */
 HWTEST_F(PasteButtonTest, ComparePasteButton002, TestSize.Level1)
 {
@@ -157,7 +157,7 @@ HWTEST_F(PasteButtonTest, ComparePasteButton002, TestSize.Level1)
  * @tc.name: ComparePasteButton003
  * @tc.desc: Test PasteButton compare
  * @tc.type: FUNC
- * @tc.require: AR000HO9JB
+ * @tc.require:
  */
 HWTEST_F(PasteButtonTest, ComparePasteButton003, TestSize.Level1)
 {

frameworks/inner_api/security_component/test/unittest/src/save_button_test.cpp

@@ -46,7 +46,7 @@ void SaveButtonTest::TearDown()
  * @tc.name: IsParamValid001
  * @tc.desc: Test save button from wrong value params json
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SaveButtonTest, IsParamValid001, TestSize.Level1)
 {
@@ -91,7 +91,7 @@ HWTEST_F(SaveButtonTest, IsParamValid001, TestSize.Level1)
  * @tc.name: CompareSaveButton001
  * @tc.desc: Test compare save button
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SaveButtonTest, CompareSaveButton001, TestSize.Level1)
 {
@@ -126,7 +126,7 @@ HWTEST_F(SaveButtonTest, CompareSaveButton001, TestSize.Level1)
  * @tc.name: CompareSaveButton002
  * @tc.desc: Test SaveButton compare
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SaveButtonTest, CompareSaveButton002, TestSize.Level1)
 {
@@ -161,7 +161,7 @@ HWTEST_F(SaveButtonTest, CompareSaveButton002, TestSize.Level1)
  * @tc.name: CompareSaveButton003
  * @tc.desc: Test SaveButton compare
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SaveButtonTest, CompareSaveButton003, TestSize.Level1)
 {

frameworks/inner_api/security_component/test/unittest/src/sec_comp_kit_test.cpp

@@ -92,7 +92,7 @@ void SecCompKitTest::TearDown()
  * @tc.name: ExceptCall001
  * @tc.desc: do kit except call.
  * @tc.type: FUNC
- * @tc.require: AR000HO9IN
+ * @tc.require:
  */
 HWTEST_F(SecCompKitTest, ExceptCall001, TestSize.Level1)
 {
@@ -140,7 +140,7 @@ HWTEST_F(SecCompKitTest, ExceptCall001, TestSize.Level1)
  * @tc.name: ExceptCall001
  * @tc.desc: test caller check.
  * @tc.type: FUNC
- * @tc.require: AR000HO9JS
+ * @tc.require:
  */
 HWTEST_F(SecCompKitTest, TestCallerCheck001, TestSize.Level1)
 {
@@ -165,7 +165,7 @@ HWTEST_F(SecCompKitTest, TestCallerCheck001, TestSize.Level1)
  * @tc.name: ExceptCall002
  * @tc.desc: test invalid caller register.
  * @tc.type: FUNC
- * @tc.require: AR000HO9JS
+ * @tc.require:
  */
 HWTEST_F(SecCompKitTest, TestCallerCheck002, TestSize.Level1)
 {
@@ -188,7 +188,7 @@ HWTEST_F(SecCompKitTest, TestCallerCheck002, TestSize.Level1)
  * @tc.name: RegisterWithoutCallback001
  * @tc.desc: test register without callback.
  * @tc.type: FUNC
- * @tc.require: AR000HO9JM
+ * @tc.require:
  */
 HWTEST_F(SecCompKitTest, RegisterWithoutCallback001, TestSize.Level1)
 {
@@ -213,7 +213,7 @@ HWTEST_F(SecCompKitTest, RegisterWithoutCallback001, TestSize.Level1)
  * @tc.name: FinishStartSAFail001
  * @tc.desc: Test update security component caller error
  * @tc.type: FUNC
- * @tc.require: AR000HO9IN
+ * @tc.require:
  */
 HWTEST_F(SecCompKitTest, FinishStartSAFail001, TestSize.Level1)
 {
@@ -228,7 +228,7 @@ HWTEST_F(SecCompKitTest, FinishStartSAFail001, TestSize.Level1)
  * @tc.name: OnLoadSystemAbilitySuccess001
  * @tc.desc: Test update security component caller error
  * @tc.type: FUNC
- * @tc.require: AR000HO9IN
+ * @tc.require:
  */
 HWTEST_F(SecCompKitTest, OnLoadSystemAbilitySuccess001, TestSize.Level1)
 {

frameworks/inner_api/security_component/test/unittest/src/sec_comp_register_callback_test.cpp

@@ -126,7 +126,7 @@ void SecCompRegisterCallbackTest::TearDown()
  * @tc.name: RegisterSecurityComponent001
  * @tc.desc: test register security component success.
  * @tc.type: FUNC
- * @tc.require: AR000HO9JM
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, RegisterSecurityComponent001, TestSize.Level1)
 {
@@ -148,7 +148,7 @@ HWTEST_F(SecCompRegisterCallbackTest, RegisterSecurityComponent001, TestSize.Lev
  * @tc.name: RegisterSecurityComponent002
  * @tc.desc: test register callback failed.
  * @tc.type: FUNC
- * @tc.require: AR000HO9JM
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, RegisterSecurityComponent002, TestSize.Level1)
 {
@@ -175,7 +175,7 @@ HWTEST_F(SecCompRegisterCallbackTest, RegisterSecurityComponent002, TestSize.Lev
  * @tc.name: RegisterSecurityComponent003
  * @tc.desc: test register in MaliciousAppList.
  * @tc.type: FUNC
- * @tc.require: AR000HO9JM
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, RegisterSecurityComponent003, TestSize.Level1)
 {
@@ -194,7 +194,7 @@ HWTEST_F(SecCompRegisterCallbackTest, RegisterSecurityComponent003, TestSize.Lev
  * @tc.name: RegisterSecurityComponent004
  * @tc.desc: Test register security component check touch info failed
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, RegisterSecurityComponent004, TestSize.Level1)
 {
@@ -232,7 +232,7 @@ HWTEST_F(SecCompRegisterCallbackTest, RegisterSecurityComponent004, TestSize.Lev
  * @tc.name: RegisterSecurityComponent005
  * @tc.desc: Test register security component permission grant failed
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, RegisterSecurityComponent005, TestSize.Level1)
 {
@@ -269,7 +269,7 @@ HWTEST_F(SecCompRegisterCallbackTest, RegisterSecurityComponent005, TestSize.Lev
  * @tc.name: RegisterSecurityComponent006
  * @tc.desc: Test register security component permission grant failed caller error
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, RegisterSecurityComponent006, TestSize.Level1)
 {
@@ -285,7 +285,7 @@ HWTEST_F(SecCompRegisterCallbackTest, RegisterSecurityComponent006, TestSize.Lev
  * @tc.name: ReportSecurityComponentClickEvent001
  * @tc.desc: Test register security component success
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, ReportSecurityComponentClickEvent001, TestSize.Level1)
 {
@@ -323,7 +323,7 @@ HWTEST_F(SecCompRegisterCallbackTest, ReportSecurityComponentClickEvent001, Test
  * @tc.name: ReportSecurityComponentClickEvent002
  * @tc.desc: Test report security component caller error
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, ReportSecurityComponentClickEvent002, TestSize.Level1)
 {
@@ -365,7 +365,7 @@ HWTEST_F(SecCompRegisterCallbackTest, ReportSecurityComponentClickEvent002, Test
  * @tc.name: ReportSecurityComponentClickEvent003
  * @tc.desc: Test report security component enhance data is empty
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, ReportSecurityComponentClickEvent003, TestSize.Level1)
 {
@@ -405,7 +405,7 @@ HWTEST_F(SecCompRegisterCallbackTest, ReportSecurityComponentClickEvent003, Test
  * @tc.name: ReportSecurityComponentClickEvent004
  * @tc.desc: Test report security component dialog callback is nullptr
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, ReportSecurityComponentClickEvent004, TestSize.Level1)
 {
@@ -440,7 +440,7 @@ HWTEST_F(SecCompRegisterCallbackTest, ReportSecurityComponentClickEvent004, Test
  * @tc.name: ReportClickWithoutHmac001
  * @tc.desc: Test report click event permission denied
  * @tc.type: FUNC
- * @tc.require: AR000HO9JM
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, ReportClickWithoutHmac001, TestSize.Level1)
 {
@@ -480,7 +480,7 @@ HWTEST_F(SecCompRegisterCallbackTest, ReportClickWithoutHmac001, TestSize.Level1
  * @tc.name: VerifySavePermission001
  * @tc.desc: Test register security component wrong hap
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, VerifySavePermission001, TestSize.Level1)
 {
@@ -524,7 +524,7 @@ HWTEST_F(SecCompRegisterCallbackTest, VerifySavePermission001, TestSize.Level1)
  * @tc.name: VerifySavePermission002
  * @tc.desc: Test register security component invalid tokenId
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, VerifySavePermission002, TestSize.Level1)
 {
@@ -561,7 +561,7 @@ HWTEST_F(SecCompRegisterCallbackTest, VerifySavePermission002, TestSize.Level1)
  * @tc.name: UnregisterSecurityComponent001
  * @tc.desc: Test unregister security component caller error
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, UnregisterSecurityComponent001, TestSize.Level1)
 {
@@ -598,7 +598,7 @@ HWTEST_F(SecCompRegisterCallbackTest, UnregisterSecurityComponent001, TestSize.L
  * @tc.name: UpdateSecurityComponent001
  * @tc.desc: Test update security component success
  * @tc.type: FUNC
- * @tc.require: AR000HO9IN
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, UpdateSecurityComponent001, TestSize.Level1)
 {
@@ -616,7 +616,7 @@ HWTEST_F(SecCompRegisterCallbackTest, UpdateSecurityComponent001, TestSize.Level
  * @tc.name: UpdateSecurityComponent002
  * @tc.desc: Test update security component caller error
  * @tc.type: FUNC
- * @tc.require: AR000HO9IN
+ * @tc.require:
  */
 HWTEST_F(SecCompRegisterCallbackTest, UpdateSecurityComponent002, TestSize.Level1)
 {

services/security_component_service/sa/sa_main/sec_comp_manager.cpp

@@ -59,15 +59,30 @@ SecCompManager& SecCompManager::GetInstance()
     }
     return *instance;
 }
+bool SecCompManager::IsScIdExist(int32_t scId)
+{
+    OHOS::Utils::UniqueReadGuard<OHOS::Utils::RWLock> lk(this->componentInfoLock_);
+    for (auto it = componentMap_.begin(); it != componentMap_.end(); ++it) {
+        for (auto iter = it->second.compList.begin(); iter != it->second.compList.end(); ++iter) {
+            std::shared_ptr<SecCompEntity> sc = *iter;
+            if (sc != nullptr && scId == sc->scId_) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
 
 int32_t SecCompManager::CreateScId()
 {
     std::lock_guard<std::mutex> lock(scIdMtx_);
-    if (scIdStart_ == MAX_INT_NUM) {
-        scIdStart_ = SC_ID_START;
-    } else {
-        scIdStart_++;
-    }
+    do {
+        if (scIdStart_ == MAX_INT_NUM) {
+            scIdStart_ = SC_ID_START;
+        } else {
+            scIdStart_++;
+        }
+    } while (IsScIdExist(scIdStart_));
     return scIdStart_;
 }
 

services/security_component_service/sa/sa_main/sec_comp_manager.h

@@ -72,6 +72,7 @@ private:
     SecCompManager();
     bool IsForegroundCompExist();
     bool IsCompExist();
+    bool IsScIdExist(int32_t scId);
     int32_t AddSecurityComponentToList(int32_t pid,
         AccessToken::AccessTokenID tokenId, std::shared_ptr<SecCompEntity> newEntity);
     int32_t DeleteSecurityComponentFromList(int32_t pid, int32_t scId);

services/security_component_service/sa/test/unittest/src/app_state_observer_test.cpp

@@ -53,7 +53,7 @@ void AppStateObserverTest::TearDown()
  * @tc.name: IsProcessForeground001
  * @tc.desc: Test is process foreground
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(AppStateObserverTest, IsProcessForeground001, TestSize.Level1)
 {
@@ -70,7 +70,7 @@ HWTEST_F(AppStateObserverTest, IsProcessForeground001, TestSize.Level1)
  * @tc.name: AddProcessToForegroundSet001
  * @tc.desc: Test add process to foreground
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(AppStateObserverTest, AddProcessToForegroundSet001, TestSize.Level1)
 {
@@ -95,7 +95,7 @@ HWTEST_F(AppStateObserverTest, AddProcessToForegroundSet001, TestSize.Level1)
  * @tc.name: RemoveProcessFromForegroundSet001
  * @tc.desc: Test remove process from foreground
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(AppStateObserverTest, RemoveProcessFromForegroundSet001, TestSize.Level1)
 {
@@ -114,7 +114,7 @@ HWTEST_F(AppStateObserverTest, RemoveProcessFromForegroundSet001, TestSize.Level
  * @tc.name: RemoveProcessFromForegroundSet002
  * @tc.desc: Test remove process with different uid
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(AppStateObserverTest, RemoveProcessFromForegroundSet002, TestSize.Level1)
 {
@@ -133,7 +133,7 @@ HWTEST_F(AppStateObserverTest, RemoveProcessFromForegroundSet002, TestSize.Level
  * @tc.name: OnProcessStateChanged001
  * @tc.desc: Test recieve process state changed
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(AppStateObserverTest, OnProcessStateChanged001, TestSize.Level1)
 {
@@ -157,7 +157,7 @@ HWTEST_F(AppStateObserverTest, OnProcessStateChanged001, TestSize.Level1)
  * @tc.name: OnProcessStateChanged002
  * @tc.desc: Test add process to foregroundset twice
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(AppStateObserverTest, OnProcessStateChanged002, TestSize.Level1)
 {
@@ -177,7 +177,7 @@ HWTEST_F(AppStateObserverTest, OnProcessStateChanged002, TestSize.Level1)
  * @tc.name: OnProcessDied001
  * @tc.desc: Test recieve process state died
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(AppStateObserverTest, OnProcessDied001, TestSize.Level1)
 {
@@ -202,7 +202,7 @@ HWTEST_F(AppStateObserverTest, OnProcessDied001, TestSize.Level1)
  * @tc.name: AddProcessToForegroundSet002
  * @tc.desc: Test add process to foreground
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(AppStateObserverTest, AddProcessToForegroundSet002, TestSize.Level1)
 {
@@ -223,7 +223,7 @@ HWTEST_F(AppStateObserverTest, AddProcessToForegroundSet002, TestSize.Level1)
  * @tc.name: DumpProcess001
  * @tc.desc: Test DumpProcess
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(AppStateObserverTest, DumpProcess001, TestSize.Level1)
 {

services/security_component_service/sa/test/unittest/src/sec_comp_entity_test.cpp

@@ -65,7 +65,7 @@ void SecCompEntityTest::TearDown()
  * @tc.name: GrantTempPermission001
  * @tc.desc: Test grant location permission
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompEntityTest, GrantTempPermission001, TestSize.Level1)
 {
@@ -89,7 +89,7 @@ HWTEST_F(SecCompEntityTest, GrantTempPermission001, TestSize.Level1)
  * @tc.name: GrantTempPermission002
  * @tc.desc: Test grant paste permission with invalid tokenId.
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompEntityTest, GrantTempPermission002, TestSize.Level1)
 {
@@ -106,7 +106,7 @@ HWTEST_F(SecCompEntityTest, GrantTempPermission002, TestSize.Level1)
  * @tc.name: CheckClickInfo001
  * @tc.desc: Test touch info
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompEntityTest, CheckClickInfo001, TestSize.Level1)
 {
@@ -173,7 +173,7 @@ HWTEST_F(SecCompEntityTest, CheckClickInfo002, TestSize.Level1)
  * @tc.name: CompareComponentBasicInfo001
  * @tc.desc: Test Basic info
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompEntityTest, CompareComponentBasicInfo001, TestSize.Level1)
 {
@@ -189,7 +189,7 @@ HWTEST_F(SecCompEntityTest, CompareComponentBasicInfo001, TestSize.Level1)
  * @tc.name: CheckKeyEvent001
  * @tc.desc: Test CheckKeyEvent
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompEntityTest, CheckKeyEvent001, TestSize.Level1)
 {

services/security_component_service/sa/test/unittest/src/sec_comp_info_helper_test.cpp

@@ -83,7 +83,7 @@ void SecCompInfoHelperTest::TearDown()
  * @tc.name: ParseComponent001
  * @tc.desc: Test parse component info success
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent001, TestSize.Level1)
 {
@@ -99,7 +99,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent001, TestSize.Level1)
  * @tc.name: ParseComponent002
  * @tc.desc: Test parse component info with empty json
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent002, TestSize.Level1)
 {
@@ -116,7 +116,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent002, TestSize.Level1)
  * @tc.name: ParseComponent003
  * @tc.desc: Test parse component info with invalid type
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent003, TestSize.Level1)
 {
@@ -147,7 +147,7 @@ static SecCompRect GetDefaultRect(void)
  * @tc.name: ParseComponent004
  * @tc.desc: Test parse component info with invalid rect
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent004, TestSize.Level1)
 {
@@ -199,7 +199,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent004, TestSize.Level1)
  * @tc.name: ParseComponent005
  * @tc.desc: Test parse component info with windowRect invalid
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent005, TestSize.Level1)
 {
@@ -242,7 +242,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent005, TestSize.Level1)
  * @tc.name: ParseComponent006
  * @tc.desc: Test parse component info with parentEffect active
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent006, TestSize.Level1)
 {
@@ -270,7 +270,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent006, TestSize.Level1)
  * @tc.name: ParseComponent007
  * @tc.desc: Test parse component info with invalid size
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent007, TestSize.Level1)
 {
@@ -301,7 +301,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent007, TestSize.Level1)
  * @tc.name: ParseComponent008
  * @tc.desc: Test parse component info with invalid size
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent008, TestSize.Level1)
 {
@@ -327,7 +327,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent008, TestSize.Level1)
  * @tc.name: ParseComponent009
  * @tc.desc: Test parse component info with invalid size
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent009, TestSize.Level1)
 {
@@ -353,7 +353,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent009, TestSize.Level1)
  * @tc.name: ParseComponent010
  * @tc.desc: Test parse component info with invalid color
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent010, TestSize.Level1)
 {
@@ -378,7 +378,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent010, TestSize.Level1)
  * @tc.name: ParseComponent011
  * @tc.desc: Test parse component info with invalid style
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent011, TestSize.Level1)
 {
@@ -401,7 +401,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent011, TestSize.Level1)
  * @tc.name: ParseComponent012
  * @tc.desc: Test parse component info with invalid style
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent012, TestSize.Level1)
 {
@@ -431,7 +431,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent012, TestSize.Level1)
  * @tc.name: ParseComponent013
  * @tc.desc: Test parse component info with invalid style
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent013, TestSize.Level1)
 {
@@ -463,7 +463,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent013, TestSize.Level1)
  * @tc.name: ParseComponent014
  * @tc.desc: Test parse component info with invalid style
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent014, TestSize.Level1)
 {
@@ -497,7 +497,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent014, TestSize.Level1)
  * @tc.name: ParseComponent015
  * @tc.desc: Test parse component info with similar color
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, ParseComponent015, TestSize.Level1)
 {
@@ -525,7 +525,7 @@ HWTEST_F(SecCompInfoHelperTest, ParseComponent015, TestSize.Level1)
  * @tc.name: CheckComponentValid001
  * @tc.desc: Test CheckComponentValid with invalid color
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, CheckComponentValid001, TestSize.Level1)
 {
@@ -548,7 +548,7 @@ HWTEST_F(SecCompInfoHelperTest, CheckComponentValid001, TestSize.Level1)
  * @tc.name: CheckComponentValid002
  * @tc.desc: Test CheckComponentValid with invalid text or icon
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, CheckComponentValid002, TestSize.Level1)
 {
@@ -571,7 +571,7 @@ HWTEST_F(SecCompInfoHelperTest, CheckComponentValid002, TestSize.Level1)
  * @tc.name: CheckComponentValid003
  * @tc.desc: Test CheckComponentValid with invalid type
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompInfoHelperTest, CheckComponentValid003, TestSize.Level1)
 {

services/security_component_service/sa/test/unittest/src/sec_comp_manager_test.cpp

@@ -128,7 +128,7 @@ void SecCompManagerTest::TearDown()
  * @tc.name: CreateScId001
  * @tc.desc: Test create sc id
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, CreateScId001, TestSize.Level1)
 {
@@ -139,11 +139,34 @@ HWTEST_F(SecCompManagerTest, CreateScId001, TestSize.Level1)
     ASSERT_EQ(ServiceTestCommon::SC_ID_START + 1, SecCompManager::GetInstance().CreateScId());
 }
 
+/**
+ * @tc.name: CreateScId002
+ * @tc.desc: Test create sc id
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(SecCompManagerTest, CreateScId002, TestSize.Level1)
+{
+    std::shared_ptr<LocationButton> compPtr = std::make_shared<LocationButton>();
+    ASSERT_NE(nullptr, compPtr);
+    compPtr->rect_.x_ = ServiceTestCommon::TEST_COORDINATE;
+    compPtr->rect_.y_ = ServiceTestCommon::TEST_COORDINATE;
+    compPtr->rect_.width_ = ServiceTestCommon::TEST_COORDINATE;
+    compPtr->rect_.height_ = ServiceTestCommon::TEST_COORDINATE;
+    std::shared_ptr<SecCompEntity> entity =
+        std::make_shared<SecCompEntity>(
+        compPtr, ServiceTestCommon::TEST_TOKEN_ID, ServiceTestCommon::SC_ID_START, 1, 1);
+    ASSERT_EQ(SC_OK, SecCompManager::GetInstance().AddSecurityComponentToList(1, 0, entity));
+
+    SecCompManager::GetInstance().scIdStart_ = ServiceTestCommon::MAX_INT_NUM;
+    ASSERT_EQ(ServiceTestCommon::SC_ID_START + 1, SecCompManager::GetInstance().CreateScId());
+}
+
 /**
  * @tc.name: AddSecurityComponentToList001
  * @tc.desc: Test add security component to list
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, AddSecurityComponentToList001, TestSize.Level1)
 {
@@ -175,7 +198,7 @@ HWTEST_F(SecCompManagerTest, AddSecurityComponentToList001, TestSize.Level1)
  * @tc.name: AddSecurityComponentToList002
  * @tc.desc: Test add security component to list sa not exit
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, AddSecurityComponentToList002, TestSize.Level1)
 {
@@ -195,7 +218,7 @@ HWTEST_F(SecCompManagerTest, AddSecurityComponentToList002, TestSize.Level1)
  * @tc.name: DeleteSecurityComponentFromList001
  * @tc.desc: Test delete security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, DeleteSecurityComponentFromList001, TestSize.Level1)
 {
@@ -225,7 +248,7 @@ HWTEST_F(SecCompManagerTest, DeleteSecurityComponentFromList001, TestSize.Level1
  * @tc.name: GetSecurityComponentFromList001
  * @tc.desc: Test get security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, GetSecurityComponentFromList001, TestSize.Level1)
 {
@@ -253,7 +276,7 @@ HWTEST_F(SecCompManagerTest, GetSecurityComponentFromList001, TestSize.Level1)
  * @tc.name: NotifyProcessBackground001
  * @tc.desc: Test notify process background
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, NotifyProcessBackground001, TestSize.Level1)
 {
@@ -285,7 +308,7 @@ HWTEST_F(SecCompManagerTest, NotifyProcessBackground001, TestSize.Level1)
  * @tc.name: NotifyProcessDied001
  * @tc.desc: Test notify process died
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, NotifyProcessDied001, TestSize.Level1)
 {
@@ -326,7 +349,7 @@ HWTEST_F(SecCompManagerTest, NotifyProcessDied001, TestSize.Level1)
  * @tc.name: RegisterSecurityComponent001
  * @tc.desc: Test register security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, RegisterSecurityComponent001, TestSize.Level1)
 {
@@ -360,7 +383,7 @@ HWTEST_F(SecCompManagerTest, RegisterSecurityComponent001, TestSize.Level1)
  * @tc.name: UpdateSecurityComponent001
  * @tc.desc: Test update security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, UpdateSecurityComponent001, TestSize.Level1)
 {
@@ -402,7 +425,7 @@ HWTEST_F(SecCompManagerTest, UpdateSecurityComponent001, TestSize.Level1)
  * @tc.name: UnregisterSecurityComponent001
  * @tc.desc: Test unregister security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, UnregisterSecurityComponent001, TestSize.Level1)
 {
@@ -419,7 +442,7 @@ HWTEST_F(SecCompManagerTest, UnregisterSecurityComponent001, TestSize.Level1)
  * @tc.name: ReportSecurityComponentClickEvent001
  * @tc.desc: Test report security component click
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, ReportSecurityComponentClickEvent001, TestSize.Level1)
 {
@@ -465,7 +488,7 @@ HWTEST_F(SecCompManagerTest, AddSecurityComponentToList004, TestSize.Level1)
  * @tc.name: CheckClickSecurityComponentInfo001
  * @tc.desc: Test check click security component info failed
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, CheckClickSecurityComponentInfo001, TestSize.Level1)
 {
@@ -507,7 +530,7 @@ HWTEST_F(SecCompManagerTest, CheckClickSecurityComponentInfo001, TestSize.Level1
  * @tc.name: AddSecurityComponentToList003
  * @tc.desc: Test add security component to list sa not exit
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, AddSecurityComponentToList003, TestSize.Level1)
 {
@@ -525,7 +548,7 @@ HWTEST_F(SecCompManagerTest, AddSecurityComponentToList003, TestSize.Level1)
  * @tc.name: DeleteSecurityComponentFromList002
  * @tc.desc: Test delete security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, DeleteSecurityComponentFromList002, TestSize.Level1)
 {
@@ -550,7 +573,7 @@ HWTEST_F(SecCompManagerTest, DeleteSecurityComponentFromList002, TestSize.Level1
  * @tc.name: UpdateSecurityComponent002
  * @tc.desc: Test update security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, UpdateSecurityComponent002, TestSize.Level1)
 {
@@ -573,7 +596,7 @@ HWTEST_F(SecCompManagerTest, UpdateSecurityComponent002, TestSize.Level1)
  * @tc.name: ExitSaProcess001
  * @tc.desc: Test check ExitSaProcess
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, ExitSaProcess001, TestSize.Level1)
 {
@@ -616,7 +639,7 @@ HWTEST_F(SecCompManagerTest, ExitSaProcess001, TestSize.Level1)
  * @tc.name: ExitWhenAppMgrDied001
  * @tc.desc: Test check ExitWhenAppMgrDied
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, ExitWhenAppMgrDied001, TestSize.Level1)
 {
@@ -659,7 +682,7 @@ HWTEST_F(SecCompManagerTest, ExitWhenAppMgrDied001, TestSize.Level1)
  * @tc.name: SendCheckInfoEnhanceSysEvent001
  * @tc.desc: Test check SendCheckInfoEnhanceSysEvent
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, SendCheckInfoEnhanceSysEvent001, TestSize.Level1)
 {
@@ -675,7 +698,7 @@ HWTEST_F(SecCompManagerTest, SendCheckInfoEnhanceSysEvent001, TestSize.Level1)
  * @tc.name: DumpSecComp001
  * @tc.desc: Test check DumpSecComp
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, DumpSecComp001, TestSize.Level1)
 {
@@ -699,7 +722,7 @@ HWTEST_F(SecCompManagerTest, DumpSecComp001, TestSize.Level1)
  * @tc.name: TransformCallBackResult001
  * @tc.desc: Test check TransformCallBackResult
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompManagerTest, TransformCallBackResult001, TestSize.Level1)
 {

services/security_component_service/sa/test/unittest/src/sec_comp_service_mock_test.cpp

@@ -75,7 +75,7 @@ void SecCompServiceMockTest::TearDown()
  * @tc.name: RegisterSecurityComponent001
  * @tc.desc: Test register security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceMockTest, RegisterSecurityComponent001, TestSize.Level1)
 {
@@ -124,7 +124,7 @@ HWTEST_F(SecCompServiceMockTest, RegisterSecurityComponent001, TestSize.Level1)
  * @tc.name: RegisterSecurityComponent002
  * @tc.desc: Test register security component check touch info failed
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceMockTest, RegisterSecurityComponent002, TestSize.Level1)
 {
@@ -161,7 +161,7 @@ HWTEST_F(SecCompServiceMockTest, RegisterSecurityComponent002, TestSize.Level1)
  * @tc.name: RegisterSecurityComponent003
  * @tc.desc: Test register security component permission grant failed
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceMockTest, RegisterSecurityComponent003, TestSize.Level1)
 {
@@ -204,7 +204,7 @@ HWTEST_F(SecCompServiceMockTest, RegisterSecurityComponent003, TestSize.Level1)
  * @tc.name: ReportSecurityComponentClickEvent001
  * @tc.desc: Test register security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceMockTest, ReportSecurityComponentClickEvent001, TestSize.Level1)
 {
@@ -263,7 +263,7 @@ HWTEST_F(SecCompServiceMockTest, ReportSecurityComponentClickEvent001, TestSize.
  * @tc.name: ReportSecurityComponentClickEvent002
  * @tc.desc: Test verify location permission
  * @tc.type: FUNC
- * @tc.require: AR000HO9IN
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceMockTest, ReportSecurityComponentClickEvent002, TestSize.Level1)
 {

services/security_component_service/sa/test/unittest/src/sec_comp_service_test.cpp

@@ -77,7 +77,7 @@ void SecCompServiceTest::TearDown()
  * @tc.name: Onstart001
  * @tc.desc: Test OnStart
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceTest, OnStart001, TestSize.Level1)
 {
@@ -99,7 +99,7 @@ HWTEST_F(SecCompServiceTest, OnStart001, TestSize.Level1)
  * @tc.name: RegisterAppStateObserver001
  * @tc.desc: Test RegisterAppStateObserver
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceTest, RegisterAppStateObserver001, TestSize.Level1)
 {
@@ -162,7 +162,7 @@ HWTEST_F(SecCompServiceTest, RegisterAppStateObserver001, TestSize.Level1)
  * @tc.name: UnregisterAppStateObserver001
  * @tc.desc: Test RegisterAppStateObserver
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceTest, UnregisterAppStateObserver001, TestSize.Level1)
 {
@@ -179,7 +179,7 @@ HWTEST_F(SecCompServiceTest, UnregisterAppStateObserver001, TestSize.Level1)
  * @tc.name: GetCallerInfo001
  * @tc.desc: Test get caller info
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceTest, GetCallerInfo001, TestSize.Level1)
 {
@@ -204,7 +204,7 @@ HWTEST_F(SecCompServiceTest, GetCallerInfo001, TestSize.Level1)
  * @tc.name: UnregisterSecurityComponent001
  * @tc.desc: Test unregister security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceTest, UnregisterSecurityComponent001, TestSize.Level1)
 {
@@ -217,7 +217,7 @@ HWTEST_F(SecCompServiceTest, UnregisterSecurityComponent001, TestSize.Level1)
  * @tc.name: UpdateSecurityComponent001
  * @tc.desc: Test update security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceTest, UpdateSecurityComponent001, TestSize.Level1)
 {
@@ -238,7 +238,7 @@ HWTEST_F(SecCompServiceTest, UpdateSecurityComponent001, TestSize.Level1)
  * @tc.name: ReportSecurityComponentClickEvent001
  * @tc.desc: Test report security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceTest, ReportSecurityComponentClickEvent001, TestSize.Level1)
 {
@@ -285,7 +285,7 @@ HWTEST_F(SecCompServiceTest, ReportSecurityComponentClickEvent001, TestSize.Leve
  * @tc.name: Dump001
  * @tc.desc: Test dump
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceTest, Dump001, TestSize.Level1)
 {
@@ -328,7 +328,7 @@ HWTEST_F(SecCompServiceTest, Dump001, TestSize.Level1)
  * @tc.name: Onstart002
  * @tc.desc: Test OnStart
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceTest, OnStart002, TestSize.Level1)
 {
@@ -348,7 +348,7 @@ HWTEST_F(SecCompServiceTest, OnStart002, TestSize.Level1)
  * @tc.name: GetCallerInfo002
  * @tc.desc: Test get caller info
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompServiceTest, GetCallerInfo002, TestSize.Level1)
 {

services/security_component_service/sa/test/unittest/src/sec_comp_stub_test.cpp

@@ -55,7 +55,7 @@ void SecCompStubTest::TearDown()
  * @tc.name: OnRemoteRequest001
  * @tc.desc: Test on remote request
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompStubTest, OnRemoteRequest001, TestSize.Level1)
 {
@@ -77,7 +77,7 @@ HWTEST_F(SecCompStubTest, OnRemoteRequest001, TestSize.Level1)
  * @tc.name: RegisterSecurityComponentInner001
  * @tc.desc: Test register security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompStubTest, RegisterSecurityComponentInner001, TestSize.Level1)
 {
@@ -91,7 +91,7 @@ HWTEST_F(SecCompStubTest, RegisterSecurityComponentInner001, TestSize.Level1)
  * @tc.name: UpdateSecurityComponentInner001
  * @tc.desc: Test update security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompStubTest, UpdateSecurityComponentInner001, TestSize.Level1)
 {
@@ -105,7 +105,7 @@ HWTEST_F(SecCompStubTest, UpdateSecurityComponentInner001, TestSize.Level1)
  * @tc.name: UnregisterSecurityComponentInner001
  * @tc.desc: Test unregister security component
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompStubTest, UnregisterSecurityComponentInner001, TestSize.Level1)
 {
@@ -118,7 +118,7 @@ HWTEST_F(SecCompStubTest, UnregisterSecurityComponentInner001, TestSize.Level1)
  * @tc.name: Marshalling001
  * @tc.desc: Test SecCompClickEventParcel::Marshalling
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompStubTest, Marshalling001, TestSize.Level1)
 {
@@ -144,7 +144,7 @@ HWTEST_F(SecCompStubTest, Marshalling001, TestSize.Level1)
  * @tc.name: Unmarshalling001
  * @tc.desc: Test SecCompClickEventParcel::Unmarshalling
  * @tc.type: FUNC
- * @tc.require: AR000HO9J7
+ * @tc.require:
  */
 HWTEST_F(SecCompStubTest, Unmarshalling001, TestSize.Level1)
 {