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

Commit b019c7ee authored by Andrei Onea's avatar Andrei Onea
Browse files

DO NOT MERGE Fix setting hidden api usage log sample rate 

This fix addresses two related issues: one with the
DeviceConfig.onPropertiesChangedListener, and another with
HiddenApiUsageLogger.setHiddenApiAccessLogSampleRates.
In both cases, setting one of the sample rates
(hidden_api_access_log_sampling_rate or
hidden_api_access_statslog_sampling_rate) unsets the other. This is due
to them being sent sequentially instead of simultaneously.
Additionally, out of an abundance of caution, mirror the behaviour in
attemptConnectionToPrimaryZygote and attemptConnectionToSecondaryZygote
for the statslog sample rate. This was overlooked in a previous change.

Bug: 119217680
Test: m
Test: cts-tradefed run cts-dev -m CtsStatsdHostTestCases -t \
            android.cts.statsd.atom.UidAtomTests#testHiddenApiUsed

Change-Id: I8a5534403269a2339fcabc8f847199ab837ae71b
parent 2a5889ce

core/java/android/os/ZygoteProcess.java

+2 −0
Original line number Diff line number Diff line
@@ -881,6 +881,7 @@ public class ZygoteProcess { 


            maybeSetApiBlacklistExemptions(primaryZygoteState, false);

            maybeSetHiddenApiAccessLogSampleRate(primaryZygoteState);

            maybeSetHiddenApiAccessStatslogSampleRate(primaryZygoteState);

        }

    }
@@ -896,6 +897,7 @@ public class ZygoteProcess { 


            maybeSetApiBlacklistExemptions(secondaryZygoteState, false);

            maybeSetHiddenApiAccessLogSampleRate(secondaryZygoteState);

            maybeSetHiddenApiAccessStatslogSampleRate(secondaryZygoteState);

        }

    }

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

+7 −2
Original line number Diff line number Diff line
@@ -406,9 +406,14 @@ class ZygoteConnection { 
        private int mHiddenApiAccessStatslogSampleRate = 0;



        public static void setHiddenApiAccessLogSampleRates(int sampleRate, int newSampleRate) {

            if (sampleRate != -1) {

                sInstance.mHiddenApiAccessLogSampleRate = sampleRate;

            }



            if (newSampleRate != -1) {

                sInstance.mHiddenApiAccessStatslogSampleRate = newSampleRate;

            }

        }



        public static HiddenApiUsageLogger getInstance() {

            return HiddenApiUsageLogger.sInstance;

services/core/java/com/android/server/am/ActivityManagerService.java

+26 −11
Original line number Diff line number Diff line
@@ -2185,24 +2185,38 @@ public class ActivityManagerService extends IActivityManager.Stub 
                "hidden_api_access_statslog_sampling_rate";















        public void onPropertiesChanged(DeviceConfig.Properties properties) {













            int logSampleRate = properties.getInt(HIDDEN_API_ACCESS_LOG_SAMPLING_RATE, 0x0);













            if (logSampleRate < 0 || logSampleRate > 0x10000) {













                logSampleRate = -1;













            int logSampleRate = properties.getInt(HIDDEN_API_ACCESS_LOG_SAMPLING_RATE,













                    mLogSampleRate);













            int statslogSampleRate = properties.getInt(HIDDEN_API_ACCESS_STATSLOG_SAMPLING_RATE,













                    mStatslogSampleRate);













            setSampleRates(logSampleRate, statslogSampleRate);















        }













            if (logSampleRate != -1 && logSampleRate != mLogSampleRate) {

























        private void setSampleRates(int logSampleRate, int statslogSampleRate) {













            if (logSampleRate >= 0 && logSampleRate <= 0x10000













                    && logSampleRate != mLogSampleRate) {















                mLogSampleRate = logSampleRate;















                ZYGOTE_PROCESS.setHiddenApiAccessLogSampleRate(mLogSampleRate);















            }



























            int statslogSampleRate =













                    properties.getInt(HIDDEN_API_ACCESS_STATSLOG_SAMPLING_RATE, 0);













            if (statslogSampleRate < 0 || statslogSampleRate > 0x10000) {













                statslogSampleRate = -1;













            }













            if (statslogSampleRate != -1 && statslogSampleRate != mStatslogSampleRate) {













            if (statslogSampleRate >= 0 && statslogSampleRate <= 0x10000













                    && statslogSampleRate != mStatslogSampleRate) {















                mStatslogSampleRate = statslogSampleRate;















                ZYGOTE_PROCESS.setHiddenApiAccessStatslogSampleRate(mStatslogSampleRate);















            }

























        }

























        /**













         * Set initial sampling rates from DeviceConfig. This is required after each restart,













         * if they never get updated.













         */













        private void initializeSampleRates() {













            int logSampleRate = DeviceConfig.getInt(DeviceConfig.NAMESPACE_APP_COMPAT,













                    HIDDEN_API_ACCESS_LOG_SAMPLING_RATE, 0);













            int statslogSampleRate = DeviceConfig.getInt(DeviceConfig.NAMESPACE_APP_COMPAT,













                    HIDDEN_API_ACCESS_STATSLOG_SAMPLING_RATE, 0);













            setSampleRates(logSampleRate, statslogSampleRate);















        }





























        public HiddenApiSettings(Handler handler, Context context) {









@@ -2219,6 +2233,7 @@ public class ActivityManagerService extends IActivityManager.Stub













                    Settings.Global.getUriFor(Settings.Global.HIDDEN_API_POLICY),















                    false,















                    this);













            initializeSampleRates();















            DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_APP_COMPAT,















                    mContext.getMainExecutor(), this);















            update();