Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Frameworks: Move Log holder to be preloaded" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-28 15:16:35 +00:00
committed by Android (Google) Code Review
parent a3acf73c3e 61a3e8c23a
commit 1a17bfa25c
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/preloaded-classes
View File

@@ -2192,6 +2192,7 @@ android.util.IntProperty
android.util.Log android.util.Log
android.util.Log$1 android.util.Log$1
android.util.Log$ImmediateLogWriter android.util.Log$ImmediateLogWriter
android.util.Log$PreloadHolder
android.util.Log$TerribleFailureHandler android.util.Log$TerribleFailureHandler
android.util.LogPrinter android.util.LogPrinter
android.util.LongArray android.util.LongArray

1
config/preloaded-classes-extra
View File

@@ -8,6 +8,7 @@ android.media.MediaPlayer
android.media.SoundPool android.media.SoundPool
android.text.format.Formatter android.text.format.Formatter
android.text.Html$HtmlParser android.text.Html$HtmlParser
android.util.Log$PreloadHolder
com.android.org.conscrypt.TrustedCertificateStore com.android.org.conscrypt.TrustedCertificateStore
org.ccil.cowan.tagsoup.HTMLScanner org.ccil.cowan.tagsoup.HTMLScanner
sun.security.jca.Providers sun.security.jca.Providers

6
core/java/android/util/Log.java
View File

@@ -392,7 +392,7 @@ public final class Log {
// and the length of the tag. // and the length of the tag.
// Note: we implicitly accept possible truncation for Modified-UTF8 differences. It // Note: we implicitly accept possible truncation for Modified-UTF8 differences. It
// is too expensive to compute that ahead of time. // 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. - 2 // Two terminators.
- (tag != null ? tag.length() : 0) // Tag length. - (tag != null ? tag.length() : 0) // Tag length.
- 32; // Some slack. - 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. * a JNI call during logging.
*/ */
static class NoPreloadHolder { static class PreloadHolder {
public final static int LOGGER_ENTRY_MAX_PAYLOAD = public final static int LOGGER_ENTRY_MAX_PAYLOAD =
logger_entry_max_payload_native(); logger_entry_max_payload_native();
} }