WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ElderDrivers/EdXposed

This commit is contained in:
Jim Wu 2020-04-18 20:49:44 +08:00
parent 7b638a706d 539c66a790
commit 9efe7f445f
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
edxp-core/template_override/customize.sh
View File

@ -81,6 +81,7 @@ HUAWEI
OLD_MAGISK=false OLD_MAGISK=false
DETECTED_DEVICE=false DETECTED_DEVICE=false
#NO_PERSIST=false #NO_PERSIST=false
[[ "$(getenforce)" == "Enforcing" ]] && ENFORCE=true || ENFORCE=false
abortC() { abortC() {
rm -rf "${MODPATH}" rm -rf "${MODPATH}"
@ -268,9 +269,9 @@ fi
if [[ ${BOOTMODE} == true && ${NO_MANAGER} == true ]]; then if [[ ${BOOTMODE} == true && ${NO_MANAGER} == true ]]; then
ui_print "- Installing stub apk" ui_print "- Installing stub apk"
cp -f "${MODPATH}/EdXposed.apk" /data/local/tmp/ ${ENFORCE} && setenforce 0
pm install /data/local/tmp/EdXposed.apk 2>&2 (pm install "${MODPATH}/EdXposed.apk" >/dev/null 2>&2) || ui_print " - Stub install failed! Do not forget install EdXposed Manager manually"
rm -rf /data/local/tmp/EdXposed.apk ${ENFORCE} && setenforce 1
fi fi
if [[ "${OLD_MAGISK}" == true ]]; then if [[ "${OLD_MAGISK}" == true ]]; then

7
edxp-core/template_override/post-fs-data.sh
View File

@ -12,6 +12,7 @@ MODDIR=${0%/*}
RIRU_PATH="/data/misc/riru" RIRU_PATH="/data/misc/riru"
TARGET="${RIRU_PATH}/modules" TARGET="${RIRU_PATH}/modules"
[[ "$(getenforce)" == "Enforcing" ]] && ENFORCE=true || ENFORCE=false
EDXP_VERSION=$(grep_prop version "${MODDIR}/module.prop") EDXP_VERSION=$(grep_prop version "${MODDIR}/module.prop")
@ -142,9 +143,9 @@ if [[ "$(pm path org.meowcat.edxposed.manager)" == "" && "$(pm path de.robv.andr
NO_MANAGER=true NO_MANAGER=true
fi fi
if [[ ${NO_MANAGER} == true ]]; then if [[ ${NO_MANAGER} == true ]]; then
cp -f ${MODDIR}/EdXposed.apk /data/local/tmp/ ${ENFORCE} && setenforce 0
pm install /data/local/tmp/EdXposed.apk pm install "${MODDIR}/EdXposed.apk"
rm -rf /data/local/tmp/EdXposed.apk ${ENFORCE} && setenforce 1
fi fi
# execute live patch if rule not found # execute live patch if rule not found

3
xposed-bridge/src/main/java/android/content/res/XResources.java
View File

@ -8,6 +8,7 @@ import android.graphics.Movie;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.os.StrictMode;
import android.text.Html; import android.text.Html;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
@ -115,8 +116,10 @@ public class XResources extends XResourcesSuperClass {
if (mResDir == null) if (mResDir == null)
return false; return false;
final StrictMode.ThreadPolicy policy = StrictMode.allowThreadDiskReads();
Long lastModification = new File(mResDir).lastModified(); Long lastModification = new File(mResDir).lastModified();
Long oldModified = sResDirLastModified.get(mResDir); Long oldModified = sResDirLastModified.get(mResDir);
StrictMode.setThreadPolicy(policy);
if (lastModification.equals(oldModified)) if (lastModification.equals(oldModified))
return false; return false;