[Refactor] Fix blocking components in Android 14

Co-authored-by: Craig Gomez <[email protected]> Signed-off-by: Muntashir Al-Islam <[email protected]>
MuntashirAkon · Nov 2, 2023 · 5a78375 · 5a78375
1 parent 98ef1ce
commit 5a78375
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
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
@@ -343,13 +343,19 @@ public static int getComponentEnabledSetting(ComponentName componentName, @UserI
         }
     }
 
+    @OptIn(markerClass = BuildCompat.PrereleaseSdkCheck.class)
+    @SuppressWarnings("deprecation")
     @RequiresPermission(value = Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE)
     public static void setComponentEnabledSetting(ComponentName componentName,
                                                   @EnabledState int newState,
                                                   @EnabledFlags int flags,
                                                   @UserIdInt int userId)
             throws RemoteException {
-        getPackageManager().setComponentEnabledSetting(componentName, newState, flags, userId);
+        IPackageManager pm = getPackageManager();
+        if (BuildCompat.isAtLeastU()) {
+            String callingPackage = SelfPermissions.getCallingPackage(Users.getSelfOrRemoteUid());
+            pm.setComponentEnabledSetting(componentName, newState, flags, userId, callingPackage);
+        } else pm.setComponentEnabledSetting(componentName, newState, flags, userId);
         if (userId != UserHandleHidden.myUserId()) {
             BroadcastUtils.sendPackageAltered(ContextUtils.getContext(), new String[]{componentName.getPackageName()});
         }

diff --git a/hiddenapi/src/main/java/android/content/pm/IPackageManager.java b/hiddenapi/src/main/java/android/content/pm/IPackageManager.java
@@ -646,9 +646,18 @@ void overrideLabelAndIcon(ComponentName componentName, String nonLocalizedLabel,
 
     /**
      * As per {@link android.content.pm.PackageManager#setComponentEnabledSetting}.
+     *
+     * @deprecated Replaced by {@link #setComponentEnabledSetting(ComponentName, int, int, int, String)} in Android 14 (SDK 34)
      */
+    @Deprecated
     void setComponentEnabledSetting(ComponentName componentName, int newState, int flags, int userId) throws RemoteException;
 
+    /**
+     * As per {@link android.content.pm.PackageManager#setComponentEnabledSetting}.
+     */
+    @RequiresApi(34)
+    void setComponentEnabledSetting(ComponentName componentName, int newState, int flags, int userId, String callingPackage) throws RemoteException;
+
     /**
      * As per {@link android.content.pm.PackageManager#getComponentEnabledSetting}.
      */
@@ -959,6 +968,7 @@ boolean performDexOptMode(String packageName, boolean checkProfiles,
 
     /**
      * Ask the package manager to compile layouts in the given package.
+     *
      * @deprecated Removed in API 31 (Android 12)
      */
     @RequiresApi(Build.VERSION_CODES.Q)