Fix crashing in the AppInfo tab

Signed-off-by: Muntashir Al-Islam <muntashirakon@riseup.net>
MuntashirAkon · Dec 22, 2023 · a10b4fb · a10b4fb
1 parent 3bb9bbc
commit a10b4fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/compat/PackageManagerCompat.java b/app/src/main/java/io/github/muntashirakon/AppManager/compat/PackageManagerCompat.java
@@ -293,14 +293,15 @@ public static int getComponentEnabledSetting(ComponentName componentName,
         return getPackageManager().getComponentEnabledSetting(componentName, userId);
     }
 
+    @OptIn(markerClass = BuildCompat.PrereleaseSdkCheck.class)
     public static void setComponentEnabledSetting(ComponentName componentName,
                                                   @EnabledState int newState,
                                                   @EnabledFlags int flags,
                                                   @UserIdInt int userId)
             throws RemoteException {
         IPackageManager pm = getPackageManager();
         if (BuildCompat.isAtLeastU()) {
-            String callingPackage = SelfPermissions.getCallingPackage(Users.getSelfOrRemoteUid());
+            String callingPackage = ActivityManagerCompat.SHELL_PACKAGE_NAME;
             pm.setComponentEnabledSetting(componentName, newState, flags, userId, callingPackage);
         } else pm.setComponentEnabledSetting(componentName, newState, flags, userId);
         if (userId != UserHandleHidden.myUserId()) {

diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/details/info/AppInfoViewModel.java b/app/src/main/java/io/github/muntashirakon/AppManager/details/info/AppInfoViewModel.java
@@ -34,7 +34,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import io.github.muntashirakon.AppManager.apk.ApkFile;
 import io.github.muntashirakon.AppManager.apk.installer.PackageInstallerCompat;
 import io.github.muntashirakon.AppManager.apk.installer.PackageInstallerService;
 import io.github.muntashirakon.AppManager.backup.BackupUtils;
@@ -258,8 +257,6 @@ public void loadAppInfo() {
                 appInfo.sourceDir = new File(applicationInfo.publicSourceDir).getParent();
             }
             // Set split entries
-            ApkFile apkFile = ApkFile.getInstance(mainModel.getApkFileKey());
-            int countSplits = apkFile.getEntries().size() - 1;
             if (!isExternalApk) {
                 // Set data dirs
                 appInfo.dataDir = applicationInfo.dataDir;