diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_callback_stubs.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_callback_stubs.cpp index f338f93602e4b9512cedb36f51f7376b19fe92ae..e16b8c1df23ad7a090474b4f57ac27799ab00591 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_callback_stubs.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_callback_stubs.cpp @@ -10,6 +10,8 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and + + * limitations under the License. */ @@ -18,6 +20,7 @@ #include "access_token.h" #include "access_token_error.h" #include "accesstoken_common_log.h" + #include "permission_state_change_info_parcel.h" #include "string_ex.h" @@ -41,7 +44,7 @@ int32_t PermissionStateChangeCallbackStub::OnRemoteRequest( LOGD(ATM_DOMAIN, ATM_TAG, "Entry, code: 0x%{public}x", code); std::u16string descriptor = data.ReadInterfaceToken(); if (descriptor != IPermissionStateCallback::GetDescriptor()) { - LOGE(ATM_DOMAIN, ATM_TAG, "Get unexpect descriptor: %{public}s", Str16ToStr8(descriptor).c_str()); + LOGE(ATM_DOMAIN , ATM_TAG, "Get unexpect descriptor: %{public}s", Str16ToStr8(descriptor).c_str()); return ERROR_IPC_REQUEST_FAIL; } diff --git a/services/accesstokenmanager/permission_definitions.json b/services/accesstokenmanager/permission_definitions.json index 322c5ca870b3b545bfbd89acebb7382d6069df73..95ff72beaade1a3c9065607108943ebf98b3c7b2 100644 --- a/services/accesstokenmanager/permission_definitions.json +++ b/services/accesstokenmanager/permission_definitions.json @@ -4,18 +4,8 @@ "name": "ohos.permission.ACCESS_BIOMETRIC", "grantMode": "system_grant", "availableLevel": "normal", - "availableType": "NORMAL", - "since": 6, - "deprecated": "", - "provisionEnable": true, - "distributedSceneEnable": false - }, - { - "name": "ohos.permission.ACCESS_BBOX_DIR", - "grantMode": "system_grant", - "availableLevel": "system_basic", "availableType": "SYSTEM", - "since": 12, + "since": 6, "deprecated": "", "provisionEnable": true, "distributedSceneEnable": false @@ -3693,6 +3683,16 @@ "provisionEnable": true, "distributedSceneEnable": false }, + { + "name": "ohos.permission.TEST", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "availableType": "NORMAL", + "since": 15, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, { "name": "ohos.permission.ACCESS_SERVICE_DP", "grantMode": "system_grant", @@ -6344,6 +6344,16 @@ "provisionEnable": true, "distributedSceneEnable": false }, + { + "name": "ohos.permission.HIVIEW_TRACE_MANAGE", + "grantMode": "system_grant", + "availableLevel": "system_core", + "availableType": "SERVICE", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, { "name": "ohos.permission.ACCESS_USER_ACCOUNT_INFO", "grantMode": "system_grant", @@ -6434,16 +6444,6 @@ "provisionEnable": true, "distributedSceneEnable": false }, - { - "name": "ohos.permission.UPDATE_FONT", - "grantMode": "system_grant", - "availableLevel": "system_basic", - "availableType": "SYSTEM", - "since": 19, - "deprecated": "", - "provisionEnable": true, - "distributedSceneEnable": false - }, { "name": "ohos.permission.VISIBLE_WINDOW_INFO", "grantMode": "system_grant",