diff options
| -rw-r--r-- | config/preloaded-classes | 1 | ||||
| -rw-r--r-- | config/preloaded-classes-extra | 1 | ||||
| -rw-r--r-- | core/java/android/util/Log.java | 6 |
3 files changed, 5 insertions, 3 deletions
diff --git a/config/preloaded-classes b/config/preloaded-classes index ff61d185c2c6..479cda4ffd13 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -2192,6 +2192,7 @@ android.util.IntProperty android.util.Log android.util.Log$1 android.util.Log$ImmediateLogWriter +android.util.Log$PreloadHolder android.util.Log$TerribleFailureHandler android.util.LogPrinter android.util.LongArray diff --git a/config/preloaded-classes-extra b/config/preloaded-classes-extra index 959fff5c1e5c..09f393ad4844 100644 --- a/config/preloaded-classes-extra +++ b/config/preloaded-classes-extra @@ -8,6 +8,7 @@ android.media.MediaPlayer android.media.SoundPool android.text.format.Formatter android.text.Html$HtmlParser +android.util.Log$PreloadHolder com.android.org.conscrypt.TrustedCertificateStore org.ccil.cowan.tagsoup.HTMLScanner sun.security.jca.Providers diff --git a/core/java/android/util/Log.java b/core/java/android/util/Log.java index 8691136dfedc..029986534890 100644 --- a/core/java/android/util/Log.java +++ b/core/java/android/util/Log.java @@ -392,7 +392,7 @@ public final class Log { // and the length of the tag. // Note: we implicitly accept possible truncation for Modified-UTF8 differences. It // is too expensive to compute that ahead of time. - int bufferSize = NoPreloadHolder.LOGGER_ENTRY_MAX_PAYLOAD // Base. + int bufferSize = PreloadHolder.LOGGER_ENTRY_MAX_PAYLOAD // Base. - 2 // Two terminators. - (tag != null ? tag.length() : 0) // Tag length. - 32; // Some slack. @@ -429,10 +429,10 @@ public final class Log { } /** - * NoPreloadHelper class. Caches the LOGGER_ENTRY_MAX_PAYLOAD value to avoid + * PreloadHelper class. Caches the LOGGER_ENTRY_MAX_PAYLOAD value to avoid * a JNI call during logging. */ - static class NoPreloadHolder { + static class PreloadHolder { public final static int LOGGER_ENTRY_MAX_PAYLOAD = logger_entry_max_payload_native(); } |