diff options
| author | 2024-09-18 18:57:36 +0000 | |
|---|---|---|
| committer | 2024-09-24 17:26:22 +0000 | |
| commit | 844c70871bd122e13a1dc49a847aeee430839c32 (patch) | |
| tree | 7f042ef8f7ee8b9de796f1bd7e5e61c9369487e5 | |
| parent | 8cf31570883e075ef37c9610b396ac132e9dfc42 (diff) | |
Clean up skip_home_art_pins ablatin study flag
Bug: 340935152
Test: Check dumpsys pinner no longer skips the art pins.
Flag: EXEMPT removing skip_home_art_pins
Change-Id: I64cbd1eec2c34e51693f6678b9f14237e92c7935
| -rw-r--r-- | services/core/java/com/android/server/PinnerService.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/flags/pinner.aconfig | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/services/core/java/com/android/server/PinnerService.java b/services/core/java/com/android/server/PinnerService.java index 4bf28403b76b..596779d0415b 100644 --- a/services/core/java/com/android/server/PinnerService.java +++ b/services/core/java/com/android/server/PinnerService.java @@ -22,7 +22,6 @@ import static android.os.Process.SYSTEM_UID; import static com.android.server.flags.Flags.pinGlobalQuota; import static com.android.server.flags.Flags.pinWebview; -import static com.android.server.flags.Flags.skipHomeArtPins; import android.annotation.EnforcePermission; import android.annotation.IntDef; @@ -872,8 +871,6 @@ public final class PinnerService extends SystemService { long apkPinSizeLimit = pinSizeLimit; - boolean shouldSkipArtPins = key == KEY_HOME && skipHomeArtPins(); - for (String apk: apks) { if (apkPinSizeLimit <= 0) { Slog.w(TAG, "Reached to the pin size limit. Skipping: " + apk); @@ -882,7 +879,7 @@ public final class PinnerService extends SystemService { } String pinGroup = getNameForKey(key); - boolean shouldPinDeps = apk.equals(appInfo.sourceDir) && !shouldSkipArtPins; + boolean shouldPinDeps = apk.equals(appInfo.sourceDir); PinnedFile pf = pinFile(apk, apkPinSizeLimit, appInfo, pinGroup, shouldPinDeps); if (pf == null) { Slog.e(TAG, "Failed to pin " + apk); diff --git a/services/core/java/com/android/server/flags/pinner.aconfig b/services/core/java/com/android/server/flags/pinner.aconfig index eaa31383537a..345366882d5a 100644 --- a/services/core/java/com/android/server/flags/pinner.aconfig +++ b/services/core/java/com/android/server/flags/pinner.aconfig @@ -17,10 +17,3 @@ flag { purpose: PURPOSE_BUGFIX } } - -flag { - name: "skip_home_art_pins" - namespace: "system_performance" - description: "Ablation study flag that controls if home app odex/vdex files should be pinned in memory." - bug: "340935152" -}
\ No newline at end of file |