Skip to content
Snippets Groups Projects
Commit 1f853071 authored by Stefan Schmidt's avatar Stefan Schmidt
Browse files

Merge branch 'wip/acts' into 'kirkstone'

Remove patches that are not needed

See merge request eclipse/oniro-core/meta-openharmony!90
parents 3ed18689 ed89000b
No related branches found
No related tags found
1 merge request!90Remove patches that are not needed
Pipeline #14700 passed
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
OpenHarmony uses couple of UIDs/GIDs for running it's services.
Currently in meta-openharmony we have everything run as root, which
causes some issues in starting abilities. As a temporary workaround
we are removing the Uid check.
Apply to foundation/aafwk/standard
Signed-off-by: Francesco Pham <francesco.pham@huawei.com>
Upstream-Status: Inappropriate
diff --git a/services/abilitymgr/include/ability_util.h b/services/abilitymgr/include/ability_util.h
index a090a1eb..d495a75b 100644
--- a/services/abilitymgr/include/ability_util.h
+++ b/services/abilitymgr/include/ability_util.h
@@ -144,10 +144,10 @@ static sptr<AppExecFwk::IBundleMgr> GetBundleManager()
if (callerUid == -1) {
callerUid = IPCSkeleton::GetCallingUid();
}
- if (ROOT_UID == callerUid) {
- HILOG_ERROR("uid is root,ability cannot be start when the visible is false");
- return ABILITY_VISIBLE_FALSE_DENY_REQUEST;
- }
+ // if (ROOT_UID == callerUid) {
+ // HILOG_ERROR("uid is root,ability cannot be start when the visible is false");
+ // return ABILITY_VISIBLE_FALSE_DENY_REQUEST;
+ // }
auto bms = GetBundleManager();
CHECK_POINTER_AND_RETURN(bms, GET_ABILITY_SERVICE_FAILED);
auto isSystemApp = bms->CheckIsSystemAppByUid(callerUid);
...@@ -70,9 +70,7 @@ SRC_URI += "file://base_hiviewdfx_hiview-libfaultlogger-static.patch;patchdir=${ ...@@ -70,9 +70,7 @@ SRC_URI += "file://base_hiviewdfx_hiview-libfaultlogger-static.patch;patchdir=${
# Patch to allow /system/profile and /system/usr to be symlinks to /usr/lib/openharmony # Patch to allow /system/profile and /system/usr to be symlinks to /usr/lib/openharmony
SRC_URI += "file://foundation_distributedschedule_safwk-slash-system-symlink.patch;patchdir=${S}/foundation/distributedschedule/safwk" SRC_URI += "file://foundation_distributedschedule_safwk-slash-system-symlink.patch;patchdir=${S}/foundation/distributedschedule/safwk"
SRC_URI += "file://test-xts-acts-Start-tests-from-onInit.patch;patchdir=${S}/test/xts/acts"
SRC_URI += "file://RenderText-PerformLayout-remove-sigsegv-code.patch;patchdir=${S}/foundation/ace/ace_engine" SRC_URI += "file://RenderText-PerformLayout-remove-sigsegv-code.patch;patchdir=${S}/foundation/ace/ace_engine"
SRC_URI += "file://remove-root-uid-check.patch;patchdir=${S}/foundation/aafwk/standard"
SRC_URI += "file://test-xts-acts-timeout-increment.patch;patchdir=${S}/test/xts/acts" SRC_URI += "file://test-xts-acts-timeout-increment.patch;patchdir=${S}/test/xts/acts"
SRC_URI += "file://start-ability-timeout-increment.patch;patchdir=${S}/test/xts/acts" SRC_URI += "file://start-ability-timeout-increment.patch;patchdir=${S}/test/xts/acts"
SRC_URI += "file://test-xts-acts-fix-Defpermission-typo.patch;patchdir=${S}/test/xts/acts" SRC_URI += "file://test-xts-acts-fix-Defpermission-typo.patch;patchdir=${S}/test/xts/acts"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment