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

Commit 89acbab9 authored by Andrei Onea's avatar Andrei Onea
Browse files

Initialise hidden api usage logger pre-fork 

Topic: hidden-api-reporting-upcall
Test: m
Bug: 119217680
Change-Id: I8722f0bf4275fea4a8faf41d7b862c04b4014824
Merged-In: I80f82092ef779a7dc1f1322cb7c05ebf5e59939b
parent 20bca262

core/java/com/android/internal/os/ZygoteConnection.java

+40 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.system.OsConstants.STDOUT_FILENO; 
import static com.android.internal.os.ZygoteConnectionConstants.CONNECTION_TIMEOUT_MILLIS;

import static com.android.internal.os.ZygoteConnectionConstants.WRAPPED_PID_TIMEOUT_MILLIS;



import android.metrics.LogMaker;

import android.net.Credentials;

import android.net.LocalSocket;

import android.os.Process;
@@ -35,6 +36,9 @@ import android.system.Os; 
import android.system.StructPollfd;

import android.util.Log;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;



import dalvik.system.VMRuntime;



import libcore.io.IoUtils;
@@ -311,9 +315,43 @@ class ZygoteConnection { 
        }

    }



    private void handleHiddenApiAccessLogSampleRate(int percent) {

    private class HiddenApiUsageLogger implements VMRuntime.HiddenApiUsageLogger {



        private final MetricsLogger mMetricsLogger = new MetricsLogger();



        public void hiddenApiUsed(String packageName, String signature,

                int accessMethod, boolean accessDenied) {

            int accessMethodMetric = HiddenApiUsageLogger.ACCESS_METHOD_NONE;

            switch(accessMethod) {

                case HiddenApiUsageLogger.ACCESS_METHOD_NONE:

                    accessMethodMetric = MetricsEvent.ACCESS_METHOD_NONE;

                    break;

                case HiddenApiUsageLogger.ACCESS_METHOD_REFLECTION:

                    accessMethodMetric = MetricsEvent.ACCESS_METHOD_REFLECTION;

                    break;

                case HiddenApiUsageLogger.ACCESS_METHOD_JNI:

                    accessMethodMetric = MetricsEvent.ACCESS_METHOD_JNI;

                    break;

                case HiddenApiUsageLogger.ACCESS_METHOD_LINKING:

                    accessMethodMetric = MetricsEvent.ACCESS_METHOD_LINKING;

                    break;

            }

            LogMaker logMaker = new LogMaker(MetricsEvent.ACTION_HIDDEN_API_ACCESSED)

                    .setPackageName(packageName)

                    .addTaggedData(MetricsEvent.FIELD_HIDDEN_API_SIGNATURE, signature)

                    .addTaggedData(MetricsEvent.FIELD_HIDDEN_API_ACCESS_METHOD,

                        accessMethodMetric);

            if (accessDenied) {

                logMaker.addTaggedData(MetricsEvent.FIELD_HIDDEN_API_ACCESS_DENIED, 1);

            }

            mMetricsLogger.write(logMaker);

        }

    }



    private void handleHiddenApiAccessLogSampleRate(int samplingRate) {

        try {

            ZygoteInit.setHiddenApiAccessLogSampleRate(percent);

            ZygoteInit.setHiddenApiAccessLogSampleRate(samplingRate);

            ZygoteInit.setHiddenApiUsageLogger(new HiddenApiUsageLogger());

            mSocketOutStream.writeInt(0);

        } catch (IOException ioe) {

            throw new IllegalStateException("Error writing to command socket", ioe);

core/java/com/android/internal/os/ZygoteInit.java

+8 −0
Original line number Diff line number Diff line
@@ -532,6 +532,14 @@ public class ZygoteInit { 
        VMRuntime.getRuntime().setHiddenApiAccessLogSamplingRate(percent);

    }



    /**

     * Sets the implementation to be used for logging hidden API accesses

     * @param logger the implementation of the VMRuntime.HiddenApiUsageLogger interface

     */

    public static void setHiddenApiUsageLogger(VMRuntime.HiddenApiUsageLogger logger) {

        VMRuntime.getRuntime().setHiddenApiUsageLogger(logger);

    }



    /**

     * Creates a PathClassLoader for the given class path that is associated with a shared

     * namespace, i.e., this classloader can access platform-private native libraries. The