Merge "Fix regression in Dalvik:HEAP_TOTAL"
This commit is contained in:
@@ -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 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,
|
public void hiddenApiUsed(String packageName, String signature,
|
||||||
int accessMethod, boolean accessDenied) {
|
int accessMethod, boolean accessDenied) {
|
||||||
@@ -351,7 +356,7 @@ class ZygoteConnection {
|
|||||||
private void handleHiddenApiAccessLogSampleRate(int samplingRate) {
|
private void handleHiddenApiAccessLogSampleRate(int samplingRate) {
|
||||||
try {
|
try {
|
||||||
ZygoteInit.setHiddenApiAccessLogSampleRate(samplingRate);
|
ZygoteInit.setHiddenApiAccessLogSampleRate(samplingRate);
|
||||||
ZygoteInit.setHiddenApiUsageLogger(new HiddenApiUsageLogger());
|
ZygoteInit.setHiddenApiUsageLogger(HiddenApiUsageLogger.getInstance());
|
||||||
mSocketOutStream.writeInt(0);
|
mSocketOutStream.writeInt(0);
|
||||||
} catch (IOException ioe) {
|
} catch (IOException ioe) {
|
||||||
throw new IllegalStateException("Error writing to command socket", ioe);
|
throw new IllegalStateException("Error writing to command socket", ioe);
|
||||||
|
|||||||
Reference in New Issue
Block a user