Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d65d3cb authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by android-build-merger
Browse files

Merge "Fix regression in Dalvik:HEAP_TOTAL"

am: deb35fb0

Change-Id: I273126dfb3245c4ee7352f8021b0537a03275f5b
parents 4ab47dc5 deb35fb0
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -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);