[Refactor] Fix suspending packages in Android 14 r29 onwards

Signed-off-by: Muntashir Al-Islam <[email protected]>
MuntashirAkon · Nov 11, 2024 · b2e4ed4 · b2e4ed4
1 parent 00c30da
commit b2e4ed4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 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
@@ -437,7 +437,13 @@ public static int getApplicationEnabledSetting(String packageName, @UserIdInt in
     @RequiresPermission(allOf = {"android.permission.SUSPEND_APPS", ManifestCompat.permission.MANAGE_USERS})
     public static void suspendPackages(String[] packageNames, @UserIdInt int userId, boolean suspend) throws RemoteException {
         String callingPackage = SelfPermissions.getCallingPackage(Users.getSelfOrRemoteUid());
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            try {
+                getPackageManager().setPackagesSuspendedAsUser(packageNames, suspend, null, null, null, 0, callingPackage, 0, userId);
+            } catch (NoSuchMethodError e) {
+                getPackageManager().setPackagesSuspendedAsUser(packageNames, suspend, null, null, (SuspendDialogInfo) null, callingPackage, userId);
+            }
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             getPackageManager().setPackagesSuspendedAsUser(packageNames, suspend, null, null, (SuspendDialogInfo) null, callingPackage, userId);
         } else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.P) {
             getPackageManager().setPackagesSuspendedAsUser(packageNames, suspend, null, null, (String) null, callingPackage, userId);

diff --git a/hiddenapi/src/main/java/android/content/pm/IPackageManager.java b/hiddenapi/src/main/java/android/content/pm/IPackageManager.java
@@ -544,26 +544,39 @@ String[] setDistractingPackageRestrictionsAsUser(String[] packageNames, int rest
                                                      int userId) throws RemoteException;
 
     /**
-     * @deprecated Removed in API 28 (Android P)
+     * @deprecated Replaced in API 28 (Android P) by {@link #setPackagesSuspendedAsUser(String[], boolean, PersistableBundle, PersistableBundle, String, String, int)}
      */
     @Deprecated
     @RequiresApi(Build.VERSION_CODES.N)
     String[] setPackagesSuspendedAsUser(String[] packageNames, boolean suspended, int userId) throws RemoteException;
 
     /**
-     * @deprecated Removed in API 29 (Android Q)
+     * @deprecated Replaced in API 29 (Android Q) by {@link #setPackagesSuspendedAsUser(String[], boolean, PersistableBundle, PersistableBundle, SuspendDialogInfo, String, int)}
      */
     @Deprecated
     @RequiresApi(Build.VERSION_CODES.P)
     String[] setPackagesSuspendedAsUser(String[] packageNames, boolean suspended,
                                         PersistableBundle appExtras, PersistableBundle launcherExtras,
                                         String dialogMessage, String callingPackage, int userId) throws RemoteException;
 
+    /**
+     * @deprecated Replaced in API 34 r29 (Android U) by {@link #setPackagesSuspendedAsUser(String[], boolean, PersistableBundle, PersistableBundle, SuspendDialogInfo, int, String, int, int)}
+     */
+    @Deprecated
     @RequiresApi(Build.VERSION_CODES.Q)
     String[] setPackagesSuspendedAsUser(String[] packageNames, boolean suspended,
                                         PersistableBundle appExtras, PersistableBundle launcherExtras,
                                         SuspendDialogInfo dialogInfo, String callingPackage, int userId) throws RemoteException;
 
+    /**
+     * Introduced in API 34 r29
+     */
+    @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
+    String[] setPackagesSuspendedAsUser(String[] packageNames, boolean suspended,
+                                        PersistableBundle appExtras, PersistableBundle launcherExtras,
+                                        SuspendDialogInfo dialogInfo, int flags, String suspendingPackage,
+                                        int suspendingUserId, int targetUserId) throws RemoteException;
+
     @RequiresApi(Build.VERSION_CODES.N)
     boolean isPackageSuspendedForUser(String packageName, int userId) throws RemoteException;