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

Merge "Remove uses of libcore.io DropBox and EventLogger" am: 1c3592a865

Browse Source 
am: 14c0c4185c

Change-Id: I7450fe00df591155dc84e405d13e887e5c03f651
This commit is contained in:
Paul Duffin
2018-12-17 07:39:26 -08:00
committed by android-build-merger
parent bb67b501f9 14c0c4185c
commit 6e5de81b95
3 changed files with 0 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/dirty-image-objects
View File

@@ -44,7 +44,6 @@ java.util.function.ToIntFunction
sun.misc.FormattedFloatingDecimal sun.misc.FormattedFloatingDecimal
java.util.stream.IntStream java.util.stream.IntStream
android.icu.util.TimeZone android.icu.util.TimeZone
libcore.io.DropBox
org.apache.harmony.luni.internal.util.TimezoneGetter org.apache.harmony.luni.internal.util.TimezoneGetter
dalvik.system.SocketTagger dalvik.system.SocketTagger
dalvik.system.CloseGuard dalvik.system.CloseGuard
@@ -137,7 +136,6 @@ java.lang.CharSequence
android.icu.util.ULocale android.icu.util.ULocale
dalvik.system.BaseDexClassLoader dalvik.system.BaseDexClassLoader
android.icu.text.BreakIterator android.icu.text.BreakIterator
libcore.io.EventLogger
libcore.net.NetworkSecurityPolicy libcore.net.NetworkSecurityPolicy
android.icu.text.UnicodeSet android.icu.text.UnicodeSet
com.android.org.conscrypt.TrustedCertificateStore$PreloadHolder com.android.org.conscrypt.TrustedCertificateStore$PreloadHolder

6
config/preloaded-classes
View File

@@ -6124,12 +6124,6 @@ libcore.io.BufferIterator
libcore.io.ClassPathURLStreamHandler libcore.io.ClassPathURLStreamHandler
libcore.io.ClassPathURLStreamHandler$ClassPathURLConnection libcore.io.ClassPathURLStreamHandler$ClassPathURLConnection
libcore.io.ClassPathURLStreamHandler$ClassPathURLConnection$1 libcore.io.ClassPathURLStreamHandler$ClassPathURLConnection$1
libcore.io.DropBox
libcore.io.DropBox$DefaultReporter
libcore.io.DropBox$Reporter
libcore.io.EventLogger
libcore.io.EventLogger$DefaultReporter
libcore.io.EventLogger$Reporter
libcore.io.ForwardingOs libcore.io.ForwardingOs
libcore.io.IoBridge libcore.io.IoBridge
libcore.io.IoTracker libcore.io.IoTracker

41
core/java/android/app/ActivityThread.java
View File

@@ -81,7 +81,6 @@ import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Debug; import android.os.Debug;
import android.os.DropBoxManager;
import android.os.Environment; import android.os.Environment;
import android.os.GraphicsEnvironment; import android.os.GraphicsEnvironment;
import android.os.Handler; import android.os.Handler;
@@ -157,8 +156,6 @@ import dalvik.system.CloseGuard;
import dalvik.system.VMDebug; import dalvik.system.VMDebug;
import dalvik.system.VMRuntime; import dalvik.system.VMRuntime;
import libcore.io.DropBox;
import libcore.io.EventLogger;
import libcore.io.IoUtils; import libcore.io.IoUtils;
import libcore.net.event.NetworkEventDispatcher; import libcore.net.event.NetworkEventDispatcher;
@@ -6680,9 +6677,6 @@ public final class ActivityThread extends ClientTransactionHandler {
} }
} }
// add dropbox logging to libcore
DropBox.setReporter(new DropBoxReporter());
ViewRootImpl.ConfigChangedCallback configChangedCallback ViewRootImpl.ConfigChangedCallback configChangedCallback
= (Configuration globalConfig) -> { = (Configuration globalConfig) -> {
synchronized (mResourcesManager) { synchronized (mResourcesManager) {
@@ -6736,38 +6730,6 @@ public final class ActivityThread extends ClientTransactionHandler {
} }
} }
private static class EventLoggingReporter implements EventLogger.Reporter {
@Override
public void report (int code, Object... list) {
EventLog.writeEvent(code, list);
}
}
private class DropBoxReporter implements DropBox.Reporter {
private DropBoxManager dropBox;
public DropBoxReporter() {}
@Override
public void addData(String tag, byte[] data, int flags) {
ensureInitialized();
dropBox.addData(tag, data, flags);
}
@Override
public void addText(String tag, String data) {
ensureInitialized();
dropBox.addText(tag, data);
}
private synchronized void ensureInitialized() {
if (dropBox == null) {
dropBox = (DropBoxManager) getSystemContext().getSystemService(Context.DROPBOX_SERVICE);
}
}
}
public static void main(String[] args) { public static void main(String[] args) {
Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "ActivityThreadMain"); Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "ActivityThreadMain");
@@ -6778,9 +6740,6 @@ public final class ActivityThread extends ClientTransactionHandler {
Environment.initForCurrentUser(); Environment.initForCurrentUser();
// Set the reporter for event logging in libcore
EventLogger.setReporter(new EventLoggingReporter());
// Make sure TrustedCertificateStore looks in the right place for CA certificates // Make sure TrustedCertificateStore looks in the right place for CA certificates
final File configDir = Environment.getUserConfigDirectory(UserHandle.myUserId()); final File configDir = Environment.getUserConfigDirectory(UserHandle.myUserId());
TrustedCertificateStore.setDefaultUserDirectory(configDir); TrustedCertificateStore.setDefaultUserDirectory(configDir);