summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2021-03-29 08:26:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-03-29 08:26:59 +0000
commit001d7943cb4179d252e4ee7cba62be83653955cd (patch)
treeeb05fdebbe28571f90ee41971f2c4e115f353ac8
parent2e17b07d50438a918904fcd63cef21ca91d3da3a (diff)
parent7e6f612460198a992b6c1309d59d67e1d258284c (diff)
Merge "Remove obsolete config_jitzygoteBootImagePinnerServiceFiles." am: f89bea0b69 am: 7e6f612460
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646527 Change-Id: Ie1729ab482bb3b3559d66c28b37de7a3cb110679
-rw-r--r--core/res/res/values/config.xml4
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 0 insertions, 5 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 864813e2eeed..2d55ac367246 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3415,10 +3415,6 @@
<!-- True if assistant app should be pinned via Pinner Service -->
<bool name="config_pinnerAssistantApp">false</bool>
- <!-- List of files pinned by the Pinner Service with the JIT Zygote boot image b/119800099 -->
- <string-array translatable="false" name="config_jitzygoteBootImagePinnerServiceFiles">
- </string-array>
-
<!-- Number of days preloaded file cache should be preserved on a device before it can be
deleted -->
<integer name="config_keepPreloadsMinDays">7</integer>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 926c39697240..3a149dd85f7f 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3063,7 +3063,6 @@
<java-symbol type="bool" name="config_pinnerCameraApp" />
<java-symbol type="bool" name="config_pinnerHomeApp" />
<java-symbol type="bool" name="config_pinnerAssistantApp" />
- <java-symbol type="array" name="config_jitzygoteBootImagePinnerServiceFiles" />
<java-symbol type="string" name="config_doubleTouchGestureEnableFile" />