-
Notifications
You must be signed in to change notification settings - Fork 654
Support Magisk v20.2 SEPolicy API and fix bootloop #431
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit
Hold shift + click to select a range
2f26a0e
Update magisk installer script to latest version
m0vie aa347b0
Use new Magisk installer method
m0vie 188c8b6
Support Magisk 20.2 custom sepolicy.rule
m0vie 4b706d6
Support Magisk v20.2 SEPolicy API
MlgmXyysd b91fccc
Fix can't create prop
MlgmXyysd ef8496d
Fix SEPolicy not work
MlgmXyysd 7470f6d
Remove useless file
MlgmXyysd c0bd44c
Support old Magisk
MlgmXyysd ae02fa7
Fix typo
MlgmXyysd 795affa
Format and bump version
MlgmXyysd 20fd9de
Fix OPPO Android P from @wuxianlin
MlgmXyysd 89275d3
Redirect to wiki
MlgmXyysd 767c9bc
Fix system app crash on Android Q
MlgmXyysd 461bf58
Add interface to disable modules log
MlgmXyysd 68e0e28
Update description
MlgmXyysd d9c97cc
Add support for Magisk Alpha2
MlgmXyysd e0cd2a5
Fix bootloop caused by multiple reasons
MlgmXyysd 3df8845
Fix log clear failed
MlgmXyysd 519c28c
Fix log cannot read
MlgmXyysd 7fedbe4
Optimize installer display
MlgmXyysd 85be13a
Remove useless log method
MlgmXyysd 4bcc4d4
Fix SandHook null pointer exception
MlgmXyysd 69b14e5
Add stub from EdXposed Manager
MlgmXyysd 03fd8d5
Add support for deprecated custom Magisk 20.1
MlgmXyysd 35b8552
Fix stub not include
MlgmXyysd be0f92c
Fix stub not include
MlgmXyysd 1898278
Add support for devices not have persist
MlgmXyysd 03a148a
Use app instead priv-app
MlgmXyysd 454c7f3
Leave mount info to log
MlgmXyysd b72968e
Optimize persist check
MlgmXyysd 11a644d
Fix NPE in hookXposedInstaller()
aviraxp 60951a1
Update stub Manager app
MlgmXyysd 61d985a
New test persist detection
MlgmXyysd a397f44
YAHFA: Support for android 10
paulo-raca 247f14a
Update stub prebuilt apk
MlgmXyysd 5471a41
Merge branch 'sepolicy' of https://github.com/ElderDrivers/EdXposed i…
MlgmXyysd 7ed6190
Optimize Riru-Core detection
MlgmXyysd 8131458
Fix path context & Adapt to latest Riru
MlgmXyysd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| version: '0.4.6.0_beta({build})' | ||
| version: '0.4.6.1 ({build})' | ||
|
|
||
| environment: | ||
| ANDROID_HOME: C:\android-sdk-windows | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,117 @@ | ||
| #!/system/bin/sh | ||
| # Please don't hardcode /magisk/modname/... ; instead, please use $MODDIR/... | ||
| # This will make your scripts compatible even if Magisk change its mount point in the future | ||
| MODDIR=${0%/*} | ||
|
|
||
| # This script will be executed in post-fs-data mode | ||
| # More info in the main Magisk thread | ||
| grep_prop() { | ||
| local REGEX="s/^$1=//p" | ||
| shift | ||
| local FILES=$@ | ||
| [[ -z "$FILES" ]] && FILES='/system/build.prop' | ||
| sed -n "$REGEX" ${FILES} 2>/dev/null | head -n 1 | ||
| } | ||
|
|
||
| . ${MODDIR}/util_functions.sh | ||
| EDXP_VERSION=`grep_prop version ${MODDIR}/module.prop` | ||
| ANDROID_SDK=`getprop ro.build.version.sdk` | ||
| BUILD_DESC=`getprop ro.build.description` | ||
| PRODUCT=`getprop ro.build.product` | ||
| MANUFACTURE=`getprop ro.product.manufacturer` | ||
| BRAND=`getprop ro.product.brand` | ||
| FINGERPRINT=`getprop ro.build.fingerprint` | ||
| ARCH=`getprop ro.product.cpu.abi` | ||
| DEVICE=`getprop ro.product.device` | ||
| ANDROID=`getprop ro.build.version.release` | ||
| BUILD=`getprop ro.build.id` | ||
| RIRU_VERSION=`grep_prop version ${MODDIR}/../riru-core/module.prop` | ||
| RIRU_VERCODE=`grep_prop versionCode ${MODDIR}/../riru-core/module.prop` | ||
| RIRU_APICODE=`cat /data/misc/riru/api_version` | ||
| MAGISK_VERSION=`su -v` | ||
| MAGISK_VERCODE=`su -V` | ||
| EDXP_INSTALLER=com.solohsu.android.edxp.manager | ||
| EDXP_MANAGER=org.meowcat.edxposed.manager | ||
| XP_INSTALLER=de.robv.android.xposed.installer | ||
| PATH_PREFIX_PROT=/data/user_de/0/ | ||
| PATH_PREFIX_LEGACY=/data/user/0/ | ||
|
|
||
| start_log_catchers | ||
| if [[ ${ANDROID_SDK} -ge 24 ]] | ||
| then | ||
| PATH_PREFIX=${PATH_PREFIX_PROT} | ||
| else | ||
| PATH_PREFIX=${PATH_PREFIX_LEGACY} | ||
| fi | ||
|
|
||
| DEFAULT_BASE_PATH=${PATH_PREFIX}${EDXP_INSTALLER} | ||
| BASE_PATH=${DEFAULT_BASE_PATH} | ||
|
|
||
| if [[ ! -d ${BASE_PATH} ]] | ||
| then | ||
| BASE_PATH=${PATH_PREFIX}${EDXP_MANAGER} | ||
| if [[ ! -d ${BASE_PATH} ]] | ||
| then | ||
| BASE_PATH=${PATH_PREFIX}${XP_INSTALLER} | ||
| if [[ ! -d ${BASE_PATH} ]] | ||
| then | ||
| BASE_PATH=${DEFAULT_BASE_PATH} | ||
| fi | ||
| fi | ||
| fi | ||
|
|
||
| LOG_PATH=${BASE_PATH}/log | ||
| CONF_PATH=${BASE_PATH}/conf | ||
| DISABLE_VERBOSE_LOG_FILE=${CONF_PATH}/disable_verbose_log | ||
| LOG_VERBOSE=true | ||
|
|
||
| if [[ -f ${DISABLE_VERBOSE_LOG_FILE} ]] | ||
| then | ||
| LOG_VERBOSE=false | ||
| fi | ||
|
|
||
| start_log_cather () { | ||
| LOG_FILE_NAME=$1 | ||
| LOG_TAG_FILTERS=$2 | ||
| CLEAN_OLD=$3 | ||
| START_NEW=$4 | ||
| LOG_FILE=${LOG_PATH}/${LOG_FILE_NAME} | ||
| mkdir -p ${LOG_PATH} | ||
| if [[ ${CLEAN_OLD} = true ]] | ||
| then | ||
| rm -rf ${LOG_FILE} | ||
| fi | ||
| if [[ ${START_NEW} = false ]] | ||
| then | ||
| return | ||
| fi | ||
| chmod | ||
| touch ${LOG_FILE} | ||
| chmod 777 ${LOG_FILE} | ||
| echo "--------- beginning of head">>${LOG_FILE} | ||
| echo "EdXposed Log">>${LOG_FILE} | ||
| echo "Powered by Log Catcher">>${LOG_FILE} | ||
| echo "QQ support group: 855219808">>${LOG_FILE} | ||
| echo "Telegram support group: @Code_Of_MeowCat">>${LOG_FILE} | ||
| echo "--------- beginning of information">>${LOG_FILE} | ||
| echo "Android version: ${ANDROID}">>${LOG_FILE} | ||
| echo "Android sdk: ${ANDROID_SDK}">>${LOG_FILE} | ||
| echo "Android build: ${BUILD}">>${LOG_FILE} | ||
| echo "Fingerprint: ${FINGERPRINT}">>${LOG_FILE} | ||
| echo "ROM build description: ${BUILD_DESC}">>${LOG_FILE} | ||
| echo "EdXposed Version: ${EDXP_VERSION} (api: 90.0)">>${LOG_FILE} | ||
| echo "Architecture: ${ARCH}">>${LOG_FILE} | ||
| echo "Device: ${DEVICE}">>${LOG_FILE} | ||
| echo "Manufacture: ${MANUFACTURE}">>${LOG_FILE} | ||
| echo "Brand: ${BRAND}">>${LOG_FILE} | ||
| echo "Product: ${PRODUCT}">>${LOG_FILE} | ||
| echo "Riru: ${RIRU_VERSION} (${RIRU_VERCODE}) (api: ${RIRU_APICODE})">>${LOG_FILE} | ||
| echo "Magisk: ${MAGISK_VERSION} (${MAGISK_VERCODE})">>${LOG_FILE} | ||
| logcat -f ${LOG_FILE} *:S ${LOG_TAG_FILTERS} & | ||
| } | ||
|
|
||
| start_verbose_log_catcher () { | ||
| start_log_cather all.log "EdXposed:V XSharedPreferences:V EdXposed-Bridge:V EdXposedManager:V XposedInstaller:V" true ${LOG_VERBOSE} | ||
| } | ||
|
|
||
| start_bridge_log_catcher () { | ||
| start_log_cather error.log "XSharedPreferences:V EdXposed-Bridge:V" true true | ||
| } | ||
|
|
||
| start_verbose_log_catcher | ||
|
|
||
| start_bridge_log_catcher |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| #!/sbin/sh | ||
|
|
||
| #rm -r -f /data/misc/riru/modules/edxposed/ | ||
| #rm -r -f /data/misc/riru/modules/edxp/ | ||
| rm -rf /data/misc/riru/modules/edxp |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.