Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5976077f authored by Suprabh Shukla's avatar Suprabh Shukla
Browse files

Remove disabled code for mFreezeExempt 

This has been disabled for a couple releases and no longer needed.

Test: All existing tests should pass

Flag: EXEMPT PURE_REFACTOR

Bug: 440178535
Change-Id: I6298be48a74d1a9684931dc46a917e5b9f8b76c2
parent 063fc5c4

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −4
Original line number Diff line number Diff line
@@ -19312,10 +19312,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
        return mOomAdjuster.mCachedAppOptimizer.useFreezer();

    }













    public boolean isAppFreezerExemptInstPkg() {













        return mOomAdjuster.mCachedAppOptimizer.freezerExemptInstPkg();













    }



























    /**















     * Resets the state of the {@link com.android.server.am.AppErrors} instance.















     * This is intended for testing within the CTS only and is protected by

























services/core/java/com/android/server/am/CachedAppOptimizer.java



+0
−9




























Original line number
Diff line number
Diff line








@@ -610,15 +610,6 @@ public class CachedAppOptimizer {













        }















    }





























    /**













     * Returns whether freezer exempts INSTALL_PACKAGES.













     */













    public boolean freezerExemptInstPkg() {













        synchronized (mPhenotypeFlagLock) {













            return mUseFreezer && mFreezerExemptInstPkg;













        }













    }





























    @NeverCompile















    void dump(PrintWriter pw) {















        dumpCompact(pw);

































services/core/java/com/android/server/am/OomAdjuster.java



+3
−14




























Original line number
Diff line number
Diff line








@@ -982,10 +982,7 @@ public abstract class OomAdjuster {













                    final ProcessServiceRecord psr = app.mServices;















                    int targetAdj = CACHED_APP_MIN_ADJ;





























                    if (app.isFreezeExempt()) {













                        // BIND_WAIVE_PRIORITY and the like get oom_adj 900













                        targetAdj += 0;













                    } else if (state.getHasShownUi() && uiTargetAdj < uiTierMaxAdj) {













                    if (state.getHasShownUi() && uiTargetAdj < uiTierMaxAdj) {















                        // The most recent UI-showing apps get [910, 910 + ui tier size).















                        targetAdj += uiTargetAdj++;















                    } else if ((state.getSetAdj() >= CACHED_APP_MIN_ADJ)










@@ -2641,10 +2638,6 @@ public abstract class OomAdjuster {













                return false;















            }





























            if (proc.isFreezeExempt()) {













                return false;













            }





























            // Default, freeze a process.















            return true;















        } else {









@@ -2654,10 +2647,6 @@ public abstract class OomAdjuster {













                return false;















            }





























            if (proc.isFreezeExempt()) {













                return false;













            }





























            // Reasons to freeze:















            if (proc.getCurAdj() >= CACHED_APP_MIN_ADJ) {















                // Oomscore is in a high enough state, it is safe to freeze.










@@ -2705,7 +2694,7 @@ public abstract class OomAdjuster {













                        "FreezeLite",















                        (app.isFrozen() ? "F" : "-")















                        + (app.isPendingFreeze() ? "P" : "-")













                        + (app.isFreezeExempt() ? "E" : "-")













                        + (/* Keeping for app.isFreezeExempt() */ "-")















                        + (app.shouldNotFreeze() ? "N" : "-")















                        + (hasCpuCapability ? "T" : "-")















                        + (hasImplicitCpuCapability ? "X" : "-")









@@ -2723,7 +2712,7 @@ public abstract class OomAdjuster {













                        CachedAppOptimizer.ATRACE_FREEZER_TRACK,















                        "updateAppFreezeStateLSP " + app.processName















                        + " pid: " + app.getPid()













                        + " isFreezeExempt: " + app.isFreezeExempt()













                        + " isFreezeExempt: " + false















                        + " isFrozen: " + app.isFrozen()















                        + " shouldNotFreeze: " + app.shouldNotFreeze()















                        + " shouldNotFreezeReason: " + app.shouldNotFreezeReason()

































services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java



+2
−18




























Original line number
Diff line number
Diff line








@@ -145,12 +145,6 @@ public final class ProcessCachedOptimizerRecord {













    @GuardedBy("mProcLock")















    private int mShouldNotFreezeAdjSeq;





























    /**













     * Exempt from freezer (now for system apps with INSTALL_PACKAGES permission)













     */













    @GuardedBy("mProcLock")













    private boolean mFreezeExempt;





























    /**















     * This process has been scheduled for freezing















     */










@@ -376,11 +370,6 @@ public final class ProcessCachedOptimizerRecord {













        mLastUsedTimeout = lastUsedTimeout;















    }





























    @GuardedBy("mProcLock")













    boolean isFreezeExempt() {













        return mFreezeExempt;













    }





























    @GuardedBy("mProcLock")















    void setPendingFreeze(boolean freeze) {















        mPendingFreeze = freeze;









@@ -391,11 +380,6 @@ public final class ProcessCachedOptimizerRecord {













        return mPendingFreeze;















    }





























    @GuardedBy("mProcLock")













    void setFreezeExempt(boolean exempt) {













        mFreezeExempt = exempt;













    }





























    void addFrozenProcessListener(Executor executor, FrozenProcessListener listener) {















        mFrozenProcessListeners.add(new Pair<Executor, FrozenProcessListener>(executor, listener));















    }










@@ -430,7 +414,7 @@ public final class ProcessCachedOptimizerRecord {













        pw.print(prefix);















        pw.print("hasPendingCompaction=");















        pw.print(mPendingCompact);













        pw.print(prefix); pw.print("isFreezeExempt="); pw.print(mFreezeExempt);













        pw.print(prefix);















        pw.print("isPendingFreeze="); pw.print(mPendingFreeze);















        pw.print(" " + IS_FROZEN + "="); pw.println(mFrozen);















        pw.print(prefix); pw.print("earliestFreezableTimeMs=");

































services/core/java/com/android/server/am/ProcessList.java



+0
−8




























Original line number
Diff line number
Diff line








@@ -66,7 +66,6 @@ import static com.android.server.am.ActivityManagerService.TAG_UID_OBSERVERS;













import static com.android.server.wm.WindowProcessController.STOPPED_STATE_FIRST_LAUNCH;















import static com.android.server.wm.WindowProcessController.STOPPED_STATE_FORCE_STOPPED;





























import android.Manifest;















import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.SpecialUsers.CanBeALL;










@@ -1926,13 +1925,6 @@ public final class ProcessList implements ProcessStateController.ProcessLruUpdat













                            app.info.packageName);















                    externalStorageAccess = storageManagerInternal.hasExternalStorageAccess(uid,















                            app.info.packageName);













                    if (mService.isAppFreezerExemptInstPkg()













                            && pm.checkPermission(Manifest.permission.INSTALL_PACKAGES,













                            app.info.packageName, userId)













                            == PackageManager.PERMISSION_GRANTED) {













                        Slog.i(TAG, app.info.packageName + " is exempt from freezer");













                        app.mOptRecord.setFreezeExempt(true);













                    }















                } catch (RemoteException e) {















                    throw e.rethrowAsRuntimeException();















                }