refactor(module): dynamically resolve system packages (#85)

* fix(module): resolve SystemUI package instead of hardcoding com.android.systemui

* fix(module): resolve SystemUI and Settings packages dynamically

* ui: add contributor

* fix: remove SystemUI package fallback

* restore legacy system package fallback

* fix: refresh package metadata

---------

Co-authored-by: XiaoTong6666 <xiaotong6666666666@gmail.com>

Author: soralis0912

module/src/main/cpp/core/main_zygisk.cpp

@@ -1,6 +1,8 @@
 #include <zygisk.hpp>
+#include <cstdlib>
 #include <cstring>
 #include <cerrno>
+#include <limits>
 #include <logging.h>
 #include <cstdio>
 #include <sys/socket.h>
@@ -177,28 +179,78 @@ class ZygiskModule : public zygisk::ModuleBase {
 
 static int dex_mem_fd = -1;
 static size_t dex_size = 0;
-static uid_t manager_uid = -1, settings_uid = -1;
-static char manager_process[kProcessNameMax], settings_process[kProcessNameMax];
 
-static void ReadApplicationInfo(const char* package, uid_t& uid, char* process) {
+struct AppIdentity {
+    char package[kProcessNameMax]{};
+    uid_t uid = static_cast<uid_t>(-1);
+    char process[kProcessNameMax]{};
+};
+
+static AppIdentity manager, settings;
+
+static bool ReadLine(const uint8_t* bytes, size_t size, size_t& offset, char* value,
+                     size_t value_size) {
+    if (offset >= size || value_size == 0) {
+        return false;
+    }
+
+    size_t end = offset;
+    while (end < size && bytes[end] != '\r' && bytes[end] != '\n') {
+        ++end;
+    }
+
+    size_t length = end - offset;
+    if (length == 0 || length >= value_size) {
+        return false;
+    }
+    memcpy(value, bytes + offset, length);
+    value[length] = '\0';
+
+    while (end < size && (bytes[end] == '\r' || bytes[end] == '\n')) {
+        ++end;
+    }
+    offset = end;
+    return true;
+}
+
+static bool ReadApplicationInfo(const char* name, AppIdentity& identity) {
     char buf[PATH_MAX];
-    snprintf(buf, PATH_MAX, "/data/adb/modules/%s/%s", ZYGISK_MODULE_ID, package);
+    snprintf(buf, PATH_MAX, "/data/adb/modules/%s/%s", ZYGISK_MODULE_ID, name);
     auto file = Buffer(buf);
     auto bytes = file.data();
     auto size = file.size();
     if (bytes == nullptr || size == 0) {
         LOGW("ReadApplicationInfo: failed to read %s", buf);
-        return;
+        return false;
     }
-    for (int i = 0; i < size; ++i) {
-        if (bytes[i] == '\n') {
-            memset(process, 0, kProcessNameMax);
-            size_t process_size = std::min<size_t>(size - i - 1, kProcessNameMax - 1);
-            memcpy(process, bytes + i + 1, process_size);
-            bytes[i] = 0;
-            uid = atoi((char*)bytes);
-            break;
-        }
+
+    char uid_string[32]{};
+    size_t offset = 0;
+    if (!ReadLine(bytes, size, offset, identity.package, sizeof(identity.package)) ||
+        !ReadLine(bytes, size, offset, uid_string, sizeof(uid_string)) ||
+        !ReadLine(bytes, size, offset, identity.process, sizeof(identity.process))) {
+        LOGW("ReadApplicationInfo: invalid data in %s", buf);
+        return false;
+    }
+
+    char* end = nullptr;
+    errno = 0;
+    unsigned long uid = strtoul(uid_string, &end, 10);
+    if (errno != 0 || end == uid_string || *end != '\0' ||
+        uid > std::numeric_limits<uid_t>::max()) {
+        LOGW("ReadApplicationInfo: invalid uid in %s", buf);
+        return false;
+    }
+    identity.uid = static_cast<uid_t>(uid);
+    return true;
+}
+
+static void RefreshApplicationInfo() {
+    if (manager.uid == static_cast<uid_t>(-1)) {
+        ReadApplicationInfo(MANAGER_APPLICATION_INFO, manager);
+    }
+    if (settings.uid == static_cast<uid_t>(-1)) {
+        ReadApplicationInfo(SETTINGS_APPLICATION_INFO, settings);
     }
 }
 
@@ -236,11 +288,11 @@ static bool PrepareCompanion() {
 
     LOGI("Companion: dex fd is %d", dex_mem_fd);
 
-    ReadApplicationInfo(MANAGER_APPLICATION_ID, manager_uid, manager_process);
-    ReadApplicationInfo(SETTINGS_APPLICATION_ID, settings_uid, settings_process);
+    ReadApplicationInfo(MANAGER_APPLICATION_INFO, manager);
+    ReadApplicationInfo(SETTINGS_APPLICATION_INFO, settings);
 
-    LOGI("Companion: SystemUI %d %s", manager_uid, manager_process);
-    LOGI("Companion: Settings %d %s", settings_uid, settings_process);
+    LOGI("Companion: SystemUI %s %d %s", manager.package, manager.uid, manager.process);
+    LOGI("Companion: Settings %s %d %s", settings.package, settings.uid, settings.process);
 
     result = true;
 
@@ -259,6 +311,8 @@ static void CompanionEntry(int socket) {
         return;
     }
 
+    RefreshApplicationInfo();
+
     char process_name[kProcessNameMax]{0};
     Identity whoami;
 
@@ -270,10 +324,10 @@ static void CompanionEntry(int socket) {
         read_full(socket, process_name, kProcessNameMax);
 
         LOGI("SuiCompanion: Checking app: uid=%d, process=%s", uid, process_name);
-        if (uid == manager_uid && strcmp(process_name, manager_process) == 0) {
+        if (uid == manager.uid && strcmp(process_name, manager.process) == 0) {
             whoami = Identity::SYSTEM_UI;
             LOGI("SuiCompanion: Matched SYSTEM_UI!");
-        } else if (uid == settings_uid && strcmp(process_name, settings_process) == 0) {
+        } else if (uid == settings.uid && strcmp(process_name, settings.process) == 0) {
             whoami = Identity::SETTINGS;
             LOGI("SuiCompanion: Matched SETTINGS!");
         } else {

module/src/main/cpp/include/config.h

@@ -19,8 +19,8 @@
 
 #pragma once
 
-#define MANAGER_APPLICATION_ID "com.android.systemui"
-#define SETTINGS_APPLICATION_ID "com.android.settings"
+#define MANAGER_APPLICATION_INFO "system_ui"
+#define SETTINGS_APPLICATION_INFO "settings"
 
 #define DEX_NAME "sui.dex"
 #define SYSTEM_PROCESS_CLASSNAME "rikka/sui/systemserver/SystemProcess"

module/src/main/cpp/main/uninstall_main.hpp

@@ -54,7 +54,8 @@ static int uninstall_main(int argc, char** argv) {
 
     wait_for_zygote();
 
-    app_process("/dev/sui.dex", "/dev", "rikka.sui.installer.Uninstaller", "sui_uninstaller");
+    app_process("/dev/sui.dex", "/dev", "rikka.sui.installer.Uninstaller", "sui_uninstaller",
+                root_path);
     unlink("/dev/sui.dex");
 
     return EXIT_SUCCESS;

module/src/main/java/rikka/sui/installer/Installer.java

@@ -19,49 +19,98 @@
 
 package rikka.sui.installer;
 
-import android.content.pm.ApplicationInfo;
+import android.app.ActivityThread;
+import android.content.Context;
+import android.os.Looper;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Locale;
-import rikka.hidden.compat.PackageManagerApis;
-import rikka.sui.util.SettingsPackages;
+import rikka.sui.util.SystemPackages;
+import rikka.sui.util.SystemPackages.SystemPackage;
 
 public class Installer {
 
-    private static void saveApplicationInfoToFile(String path, String packageName, String fileName, String name)
-            throws IOException {
-        ApplicationInfo ai = PackageManagerApis.getApplicationInfoNoThrow(packageName, 0, 0);
-        if (ai == null) {
-            System.out.println("! Can't fetch application info for package " + packageName);
-            return;
+    private static final int PACKAGE_INFO_RETRY_COUNT = 120;
+
+    private static boolean saveApplicationInfoToFile(
+            String path, String fileName, String name, SystemPackage systemPackage) throws IOException {
+        if (systemPackage == null) {
+            System.out.println("! Can't resolve the " + name + " package");
+            return false;
         }
-        int uid = ai.uid;
-        String processName = ai.processName != null ? ai.processName : packageName;
-        System.out.println("- " + name + ": uid=" + uid + ", processName=" + processName);
+
+        System.out.println("- " + name + ": packageName=" + systemPackage.packageName + ", uid=" + systemPackage.uid
+                + ", processName=" + systemPackage.processName);
 
         File file = new File(path, fileName);
-        if (!file.exists() && !file.createNewFile()) {
-            System.out.println("! Can't create " + file);
-            return;
+        File temporaryFile = new File(path, fileName + ".new");
+        if (temporaryFile.exists() && !temporaryFile.delete()) {
+            throw new IOException("Can't delete " + temporaryFile);
+        }
+
+        try (FileWriter writer = new FileWriter(temporaryFile)) {
+            writer.write(String.format(
+                    Locale.ENGLISH,
+                    "%s\n%d\n%s",
+                    systemPackage.packageName,
+                    systemPackage.uid,
+                    systemPackage.processName));
+        }
+
+        if (!temporaryFile.renameTo(file)) {
+            temporaryFile.delete();
+            throw new IOException("Can't replace " + file);
+        }
+        return true;
+    }
+
+    private static SystemPackage[] resolvePackages(Context context) throws InterruptedException {
+        SystemPackage systemUi = null;
+        SystemPackage settings = null;
+
+        for (int attempt = 0; attempt < PACKAGE_INFO_RETRY_COUNT; ++attempt) {
+            if (systemUi == null) {
+                systemUi = SystemPackages.resolveSystemUi(context);
+            }
+            if (settings == null) {
+                settings = SystemPackages.resolveSettings(context);
+            }
+            if (systemUi != null && settings != null) {
+                break;
+            }
+
+            if (attempt == 0 || (attempt + 1) % 10 == 0) {
+                System.out.println(
+                        "- Waiting for PackageManager (" + (attempt + 1) + "/" + PACKAGE_INFO_RETRY_COUNT + ")");
+            }
+            Thread.sleep(1000);
         }
 
-        FileWriter writer = new FileWriter(file);
-        writer.write(String.format(Locale.ENGLISH, "%d\n%s", uid, processName));
-        writer.flush();
-        writer.close();
+        return new SystemPackage[] {systemUi, settings};
     }
 
-    public static void main(String[] args) throws IOException {
+    @SuppressWarnings("deprecation")
+    public static void main(String[] args) throws IOException, InterruptedException {
         System.out.println("- AppProcess: main");
-        saveApplicationInfoToFile(args[0], "com.android.systemui", "com.android.systemui", "SystemUI");
-
-        String settingsPackageName = SettingsPackages.resolveInstalledSettingsPackage();
-        if (settingsPackageName == null) {
-            System.out.println("! Can't fetch application info for settings packages "
-                    + java.util.Arrays.toString(SettingsPackages.SETTINGS_CANDIDATES));
-        } else {
-            saveApplicationInfoToFile(args[0], settingsPackageName, SettingsPackages.SETTINGS, "Settings");
+
+        if (Looper.getMainLooper() == null) {
+            Looper.prepareMainLooper();
+        }
+        Context context = ActivityThread.systemMain().getSystemContext();
+        SystemPackage[] packages = resolvePackages(context);
+
+        if (packages[0] == null || packages[1] == null) {
+            System.out.println("! PackageManager did not resolve all required packages");
+            System.exit(1);
+            return;
+        }
+
+        if (!saveApplicationInfoToFile(args[0], "system_ui", "SystemUI", packages[0])
+                || !saveApplicationInfoToFile(args[0], "settings", "Settings", packages[1])) {
+            System.out.println("! Failed to save package metadata");
+            System.exit(1);
+            return;
         }
         System.out.println("- AppProcess: exit");
     }

module/src/main/java/rikka/sui/installer/Uninstaller.java

@@ -19,6 +19,8 @@
 
 package rikka.sui.installer;
 
+import android.app.ActivityThread;
+import android.content.Context;
 import android.content.pm.IShortcutService;
 import android.content.pm.IShortcutServiceV31;
 import android.os.Build;
@@ -30,20 +32,44 @@
 import android.system.ErrnoException;
 import android.system.Os;
 import android.util.Log;
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import dev.rikka.tools.refine.Refine;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import rikka.sui.shortcut.ShortcutConstants;
-import rikka.sui.util.SettingsPackages;
+import rikka.sui.util.SystemPackages;
+import rikka.sui.util.SystemPackages.SystemPackage;
 
 @RequiresApi(Build.VERSION_CODES.O)
 public class Uninstaller {
 
     private static final String TAG = "SuiUninstaller";
 
-    private static void removeShortcuts() throws InterruptedException, RemoteException {
+    private static @Nullable String readInstalledSettingsPackage(@Nullable String rootPath) {
+        if (rootPath == null) {
+            return null;
+        }
+
+        File file = new File(rootPath, "settings");
+        if (!file.isFile()) {
+            return null;
+        }
+
+        try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
+            return reader.readLine();
+        } catch (IOException e) {
+            Log.w(TAG, "Can't read installed Settings package", e);
+            return null;
+        }
+    }
+
+    private static void removeShortcuts(Context context, @Nullable String rootPath)
+            throws InterruptedException, RemoteException {
         IShortcutService shortcutService = null;
         IUserManager userManager = null;
 
@@ -67,7 +93,23 @@ private static void removeShortcuts() throws InterruptedException, RemoteExcepti
         List<String> list = new ArrayList<>();
         list.add(ShortcutConstants.SHORTCUT_ID);
 
-        for (String packageName : SettingsPackages.SETTINGS_CANDIDATES) {
+        List<String> packageNames = new ArrayList<>();
+        String installedPackageName = readInstalledSettingsPackage(rootPath);
+        if (installedPackageName != null) {
+            packageNames.add(installedPackageName);
+        }
+
+        SystemPackage settingsPackage = SystemPackages.resolveSettings(context);
+        while (settingsPackage == null && packageNames.isEmpty()) {
+            Thread.sleep(1000);
+            Log.v(TAG, "wait for Settings package 1s");
+            settingsPackage = SystemPackages.resolveSettings(context);
+        }
+        if (settingsPackage != null && !packageNames.contains(settingsPackage.packageName)) {
+            packageNames.add(settingsPackage.packageName);
+        }
+
+        for (String packageName : packageNames) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                 Refine.<IShortcutServiceV31>unsafeCast(shortcutService).removeDynamicShortcuts(packageName, list, 0);
             } else {
@@ -88,10 +130,12 @@ public static void main(String[] args) throws IOException, ErrnoException {
         if (Looper.myLooper() == null) {
             Looper.prepare();
         }
+        Context context = ActivityThread.systemMain().getSystemContext();
+        String rootPath = args.length > 0 ? args[0] : null;
 
         new Handler(Looper.myLooper()).post(() -> {
             try {
-                removeShortcuts();
+                removeShortcuts(context, rootPath);
             } catch (Throwable e) {
                 Log.e(TAG, Log.getStackTraceString(e));
             }