Merge "Fix regression in Dalvik:HEAP_TOTAL"

am: deb35fb00b

Change-Id: I273126dfb3245c4ee7352f8021b0537a03275f5b
This commit is contained in:
Andrei-Valentin Onea
2019-02-11 03:41:35 -08:00
committed by android-build-merger

View File

@@ -315,9 +315,14 @@ class ZygoteConnection {
}
}
private class HiddenApiUsageLogger implements VMRuntime.HiddenApiUsageLogger {
private static class HiddenApiUsageLogger implements VMRuntime.HiddenApiUsageLogger {
private final MetricsLogger mMetricsLogger = new MetricsLogger();
private static HiddenApiUsageLogger sInstance = new HiddenApiUsageLogger();
public static HiddenApiUsageLogger getInstance() {
return HiddenApiUsageLogger.sInstance;
}
public void hiddenApiUsed(String packageName, String signature,
int accessMethod, boolean accessDenied) {
@@ -351,7 +356,7 @@ class ZygoteConnection {
private void handleHiddenApiAccessLogSampleRate(int samplingRate) {
try {
ZygoteInit.setHiddenApiAccessLogSampleRate(samplingRate);
ZygoteInit.setHiddenApiUsageLogger(new HiddenApiUsageLogger());
ZygoteInit.setHiddenApiUsageLogger(HiddenApiUsageLogger.getInstance());
mSocketOutStream.writeInt(0);
} catch (IOException ioe) {
throw new IllegalStateException("Error writing to command socket", ioe);