[AppInfo] Fix freezing an app with "Remember for this app" turned on

MuntashirAkon · MuntashirAkon · commit 33af7876bf39 · 2025-07-27T10:17:18.000-07:00
Signed-off-by: Muntashir Al-Islam &lt;muntashirakon@riseup.net&gt;
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/apk/behavior/FreezeUnfreeze.java b/app/src/main/java/io/github/muntashirakon/AppManager/apk/behavior/FreezeUnfreeze.java
@@ -109,7 +109,7 @@ public static FreezeUnfreezeShortcutInfo getShortcutInfo(@NonNull Intent intent)
     @NonNull
     public static SearchableSingleChoiceDialogBuilder<Integer> getFreezeDialog(
             @NonNull Context context,
-            @FreezeUtils.FreezeType int selectedType) {
+            @FreezeUtils.FreezeMethod int selectedType) {
         CharSequence[] itemDescription = new CharSequence[FREEZING_METHODS.length];
         for (int i = 0; i < FREEZING_METHODS.length; ++i) {
             itemDescription[i] = new SpannableStringBuilder()
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/apk/behavior/FreezeUnfreezeActivity.java b/app/src/main/java/io/github/muntashirakon/AppManager/apk/behavior/FreezeUnfreezeActivity.java
@@ -163,7 +163,7 @@ public void checkNextFrozen() {
                             mOpenAppOrFreeze.postValue(shortcutInfo);
                             return;
                         }
-                        int freezeType = Optional.ofNullable(FreezeUtils.getFreezingMethod(shortcutInfo.packageName))
+                        int freezeType = Optional.ofNullable(FreezeUtils.loadFreezeMethod(shortcutInfo.packageName))
                                         .orElse(Prefs.Blocking.getDefaultFreezingMethod());
                         FreezeUtils.freeze(shortcutInfo.packageName, shortcutInfo.userId, freezeType);
                     }
@@ -177,7 +177,7 @@ public void checkNextFrozen() {
         public void freezeFinal(FreezeUnfreezeShortcutInfo shortcutInfo) {
             ThreadUtils.postOnBackgroundThread(() -> {
                 try {
-                    int freezeType = Optional.ofNullable(FreezeUtils.getFreezingMethod(shortcutInfo.packageName))
+                    int freezeType = Optional.ofNullable(FreezeUtils.loadFreezeMethod(shortcutInfo.packageName))
                             .orElse(Prefs.Blocking.getDefaultFreezingMethod());
                     FreezeUtils.freeze(shortcutInfo.packageName, shortcutInfo.userId, freezeType);
                     mIsFrozenLiveData.postValue(new Pair<>(shortcutInfo, true));
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/apk/behavior/FreezeUnfreezeService.java b/app/src/main/java/io/github/muntashirakon/AppManager/apk/behavior/FreezeUnfreezeService.java
@@ -174,7 +174,7 @@ private void freezeAllPackages() {
                                     | PackageManagerCompat.MATCH_STATIC_SHARED_AND_SDK_LIBRARIES, shortcutInfo.userId);
                     Bitmap icon = getBitmapFromDrawable(applicationInfo.loadIcon(getApplication().getPackageManager()));
                     shortcutInfo.setName(applicationInfo.loadLabel(getApplication().getPackageManager()));
-                    int freezeType = Optional.ofNullable(FreezeUtils.getFreezingMethod(shortcutInfo.packageName))
+                    int freezeType = Optional.ofNullable(FreezeUtils.loadFreezeMethod(shortcutInfo.packageName))
                             .orElse(Prefs.Blocking.getDefaultFreezingMethod());
                     FreezeUtils.freeze(shortcutInfo.packageName, shortcutInfo.userId, freezeType);
                     shortcutInfo.setIcon(getDimmedBitmap(icon));
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/backup/BackupOp.java b/app/src/main/java/io/github/muntashirakon/AppManager/backup/BackupOp.java
@@ -479,7 +479,7 @@ private void backupExtras() throws BackupException {
             }
         }
         // Backup freezeType
-        Integer freezeType = FreezeUtils.getFreezingMethod(mPackageName);
+        Integer freezeType = FreezeUtils.loadFreezeMethod(mPackageName);
         if (freezeType != null) {
             rules.setFreezeType(freezeType);
         }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/backup/RestoreOp.java b/app/src/main/java/io/github/muntashirakon/AppManager/backup/RestoreOp.java
@@ -668,7 +668,7 @@ private synchronized void restoreExtras() throws BackupException {
                         break;
                     case FREEZE:
                         int freezeType = ((FreezeRule) entry).getFreezeType();
-                        FreezeUtils.setFreezeMethod(mPackageName, freezeType);
+                        FreezeUtils.storeFreezeMethod(mPackageName, freezeType);
                         break;
                 }
             } catch (Throwable e) {
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/batchops/BatchOpsManager.java b/app/src/main/java/io/github/muntashirakon/AppManager/batchops/BatchOpsManager.java
@@ -589,7 +589,7 @@ private Result opFreeze(@NonNull BatchOpsInfo info) {
             pair = info.getPair(i);
             int type;
             if (options.isPreferCustom()) {
-                type = Optional.ofNullable(FreezeUtils.getFreezingMethod(pair.getPackageName()))
+                type = Optional.ofNullable(FreezeUtils.loadFreezeMethod(pair.getPackageName()))
                         .orElse(options.getType());
             } else type = options.getType();
             try {
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/batchops/struct/BatchFreezeOptions.java b/app/src/main/java/io/github/muntashirakon/AppManager/batchops/struct/BatchFreezeOptions.java
@@ -15,11 +15,11 @@
 public class BatchFreezeOptions implements IBatchOpOptions {
     public static final String TAG = BatchFreezeOptions.class.getSimpleName();
 
-    @FreezeUtils.FreezeType
+    @FreezeUtils.FreezeMethod
     private int mType;
     private boolean mPreferCustom;
 
-    public BatchFreezeOptions(@FreezeUtils.FreezeType int type, boolean preferCustom) {
+    public BatchFreezeOptions(@FreezeUtils.FreezeMethod int type, boolean preferCustom) {
         mType = type;
         mPreferCustom = preferCustom;
     }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/db/dao/FreezeTypeDao.java b/app/src/main/java/io/github/muntashirakon/AppManager/db/dao/FreezeTypeDao.java
@@ -5,6 +5,9 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 
 import io.github.muntashirakon.AppManager.db.entity.FreezeType;
@@ -14,8 +17,11 @@
 public interface FreezeTypeDao {
     @Nullable
     @Query("SELECT * FROM freeze_type WHERE package_name = :packageName LIMIT 1")
-    FreezeType get(@NonNull String packageName);
+    FreezeType get(String packageName);
 
-    @Query("INSERT INTO freeze_type (package_name, type) VALUES (:packageName, :type)")
-    void insert(@NonNull String packageName, @FreezeUtils.FreezeType int type);
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    void insert(FreezeType freezeType);
+
+    @Query("DELETE FROM freeze_type WHERE package_name = :packageName")
+    void delete(String packageName);
 }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/db/entity/FreezeType.java b/app/src/main/java/io/github/muntashirakon/AppManager/db/entity/FreezeType.java
@@ -17,6 +17,13 @@ public class FreezeType {
     public String packageName;
 
     @ColumnInfo(name = "type")
-    @FreezeUtils.FreezeType
+    @FreezeUtils.FreezeMethod
     public int type;
+
+    public FreezeType() {}
+
+    public FreezeType(@NonNull String packageName, @FreezeUtils.FreezeMethod int type) {
+        this.packageName = packageName;
+        this.type = type;
+    }
 }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/details/AppDetailsViewModel.java b/app/src/main/java/io/github/muntashirakon/AppManager/details/AppDetailsViewModel.java
@@ -192,7 +192,7 @@ public LiveData<Integer> getFreezeTypeLiveData() {
 
     public void loadFreezeType() {
         mExecutor.submit(() -> {
-            Integer freezeType = FreezeUtils.getFreezingMethod(mPackageName);
+            Integer freezeType = FreezeUtils.loadFreezeMethod(mPackageName);
             mFreezeTypeLiveData.postValue(freezeType);
         });
     }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/details/info/AppInfoFragment.java b/app/src/main/java/io/github/muntashirakon/AppManager/details/info/AppInfoFragment.java
@@ -2016,10 +2016,12 @@ private void showFreezeDialog(int freezeType, boolean isCustom) {
     }
 
     @WorkerThread
-    private void doFreeze(@FreezeUtils.FreezeType int freezeType, boolean remember) {
+    private void doFreeze(@FreezeUtils.FreezeMethod int freezeType, boolean remember) {
         try {
             if (remember) {
-                FreezeUtils.setFreezeMethod(mPackageName, freezeType);
+                FreezeUtils.storeFreezeMethod(mPackageName, freezeType);
+            } else {
+                FreezeUtils.deleteFreezeMethod(mPackageName);
             }
             FreezeUtils.freeze(mPackageName, mUserId, freezeType);
         } catch (Throwable th) {
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/rules/RulesStorageManager.java b/app/src/main/java/io/github/muntashirakon/AppManager/rules/RulesStorageManager.java
@@ -184,7 +184,7 @@ public void setSsaid(@NonNull String ssaid) {
         addUniqueEntry(new SsaidRule(packageName, ssaid));
     }
 
-    public void setFreezeType(@FreezeUtils.FreezeType int freezeType) {
+    public void setFreezeType(@FreezeUtils.FreezeMethod int freezeType) {
         addUniqueEntry(new FreezeRule(packageName, freezeType));
     }
 
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/rules/struct/FreezeRule.java b/app/src/main/java/io/github/muntashirakon/AppManager/rules/struct/FreezeRule.java
@@ -11,10 +11,10 @@
 import io.github.muntashirakon.AppManager.utils.FreezeUtils;
 
 public class FreezeRule extends RuleEntry {
-    @FreezeUtils.FreezeType
+    @FreezeUtils.FreezeMethod
     private int mFreezeType;
 
-    public FreezeRule(@NonNull String packageName, @FreezeUtils.FreezeType int freezeType) {
+    public FreezeRule(@NonNull String packageName, @FreezeUtils.FreezeMethod int freezeType) {
         super(packageName, STUB, RuleType.FREEZE);
         mFreezeType = freezeType;
     }
@@ -30,7 +30,7 @@ public int getFreezeType() {
         return mFreezeType;
     }
 
-    public void setFreezeType(@FreezeUtils.FreezeType int freezeType) {
+    public void setFreezeType(@FreezeUtils.FreezeMethod int freezeType) {
         mFreezeType = freezeType;
     }
 
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/settings/Prefs.java b/app/src/main/java/io/github/muntashirakon/AppManager/settings/Prefs.java
@@ -232,7 +232,7 @@ public static void setDefaultBlockingMethod(@NonNull @ComponentRule.ComponentSta
             AppPref.set(AppPref.PrefKey.PREF_DEFAULT_BLOCKING_METHOD_STR, blockingMethod);
         }
 
-        @FreezeUtils.FreezeType
+        @FreezeUtils.FreezeMethod
         public static int getDefaultFreezingMethod() {
             int freezeType = AppPref.getInt(AppPref.PrefKey.PREF_FREEZE_TYPE_INT);
             if (freezeType == FreezeUtils.FREEZE_HIDE) {
@@ -251,7 +251,7 @@ public static int getDefaultFreezingMethod() {
             return freezeType;
         }
 
-        public static void setDefaultFreezingMethod(@FreezeUtils.FreezeType int freezeType) {
+        public static void setDefaultFreezingMethod(@FreezeUtils.FreezeMethod int freezeType) {
             AppPref.set(AppPref.PrefKey.PREF_FREEZE_TYPE_INT, freezeType);
         }
     }
diff --git a/app/src/main/java/io/github/muntashirakon/AppManager/utils/FreezeUtils.java b/app/src/main/java/io/github/muntashirakon/AppManager/utils/FreezeUtils.java
@@ -20,13 +20,14 @@
 import io.github.muntashirakon.AppManager.compat.ManifestCompat;
 import io.github.muntashirakon.AppManager.compat.PackageManagerCompat;
 import io.github.muntashirakon.AppManager.db.AppsDb;
+import io.github.muntashirakon.AppManager.db.entity.FreezeType;
 import io.github.muntashirakon.AppManager.self.SelfPermissions;
 import io.github.muntashirakon.AppManager.settings.Prefs;
 
 public final class FreezeUtils {
     @IntDef({FREEZE_DISABLE, FREEZE_SUSPEND, FREEZE_HIDE, FREEZE_ADV_SUSPEND})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface FreezeType {
+    public @interface FreezeMethod {
     }
 
     public static final int FREEZE_DISABLE = 1;
@@ -35,16 +36,21 @@ public final class FreezeUtils {
     public static final int FREEZE_ADV_SUSPEND = 1 << 3;
 
     @WorkerThread
-    public static void setFreezeMethod(@NonNull String packageName, @FreezeType int freezeType) {
-        AppsDb.getInstance().freezeTypeDao().insert(packageName, freezeType);
+    public static void storeFreezeMethod(@NonNull String packageName, @FreezeMethod int freezeType) {
+        AppsDb.getInstance().freezeTypeDao().insert(new FreezeType(packageName, freezeType));
     }
 
     @WorkerThread
-    @FreezeType
+    public static void deleteFreezeMethod(@NonNull String packageName) {
+        AppsDb.getInstance().freezeTypeDao().delete(packageName);
+    }
+
+    @WorkerThread
+    @FreezeMethod
     @Nullable
-    public static Integer getFreezingMethod(@Nullable String packageName) {
+    public static Integer loadFreezeMethod(@Nullable String packageName) {
         if (packageName != null) {
-            io.github.muntashirakon.AppManager.db.entity.FreezeType freezeType;
+            FreezeType freezeType;
             freezeType = AppsDb.getInstance().freezeTypeDao().get(packageName);
             if (freezeType != null) {
                 return freezeType.type;
@@ -70,7 +76,7 @@ public static void freeze(@NonNull String packageName, @UserIdInt int userId) th
         freeze(packageName, userId, Prefs.Blocking.getDefaultFreezingMethod());
     }
 
-    public static void freeze(@NonNull String packageName, @UserIdInt int userId, @FreezeType int freezeType)
+    public static void freeze(@NonNull String packageName, @UserIdInt int userId, @FreezeMethod int freezeType)
             throws RemoteException {
         if (freezeType == FREEZE_HIDE) {
             if (SelfPermissions.checkSelfOrRemotePermission(ManifestCompat.permission.MANAGE_USERS)) {

Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,7 @@ private void backupExtras() throws BackupException {`
`479`	`479`	`}`
`480`	`480`	`}`
`481`	`481`	`// Backup freezeType`
`482`		`- Integer freezeType = FreezeUtils.getFreezingMethod(mPackageName);`
	`482`	`+ Integer freezeType = FreezeUtils.loadFreezeMethod(mPackageName);`
`483`	`483`	`if (freezeType != null) {`
`484`	`484`	`rules.setFreezeType(freezeType);`
`485`	`485`	`}`
Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,7 @@ private synchronized void restoreExtras() throws BackupException {`
`668`	`668`	`break;`
`669`	`669`	`case FREEZE:`
`670`	`670`	`int freezeType = ((FreezeRule) entry).getFreezeType();`
`671`		`- FreezeUtils.setFreezeMethod(mPackageName, freezeType);`
	`671`	`+ FreezeUtils.storeFreezeMethod(mPackageName, freezeType);`
`672`	`672`	`break;`
`673`	`673`	`}`
`674`	`674`	`} catch (Throwable e) {`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public LiveData<Integer> getFreezeTypeLiveData() {`
`192`	`192`
`193`	`193`	`public void loadFreezeType() {`
`194`	`194`	`mExecutor.submit(() -> {`
`195`		`- Integer freezeType = FreezeUtils.getFreezingMethod(mPackageName);`
	`195`	`+ Integer freezeType = FreezeUtils.loadFreezeMethod(mPackageName);`
`196`	`196`	`mFreezeTypeLiveData.postValue(freezeType);`
`197`	`197`	`});`
`198`	`198`	`}`