TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-17 20:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in sudb init

Browse Source
This commit is contained in:
topjohnwu 2017-12-25 01:32:17 +08:00
parent d2b6a700b1
commit d161a02e71
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
View File

@ -41,6 +41,10 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
private PackageManager pm; private PackageManager pm;
private SQLiteDatabase mDb; private SQLiteDatabase mDb;
private static void unmntDB() {
Shell.su(Utils.fmt("umount -l /data/user*/*/%s/*/*.db", MagiskManager.get().getPackageName()));
}
private static Context initDB(boolean verify) { private static Context initDB(boolean verify) {
Context context, de = null; Context context, de = null;
MagiskManager ce = MagiskManager.get(); MagiskManager ce = MagiskManager.get();
@ -70,16 +74,20 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (ce.magiskVersionCode < 1410) { if (ce.magiskVersionCode < 1410) {
if (context == de) { if (context == de) {
unmntDB();
ce.moveDatabaseFrom(de, DB_NAME); ce.moveDatabaseFrom(de, DB_NAME);
context = ce; context = ce;
} }
} else { } else {
if (context == ce) { if (context == ce) {
unmntDB();
de.moveDatabaseFrom(ce, DB_NAME); de.moveDatabaseFrom(ce, DB_NAME);
context = de; context = de;
} }
} }
} }
// Context might be updated
db = Utils.getDB(context, DB_NAME);
if (!Shell.rootAccess()) if (!Shell.rootAccess())
return context; return context;