Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use sampled value in hidden api logger"

Browse Source 
am: 619ed85e81

Change-Id: Ib6ff5b5aa75d1b35bf91748f260bab14aa6eabab
This commit is contained in:
Andrei-Valentin Onea
2019-02-20 07:04:44 -08:00
committed by android-build-merger
parent 17f5ae9e26 619ed85e81
commit 818e8c1bf2
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/com/android/internal/os/ZygoteConnection.java
View File

@@ -319,13 +319,25 @@ class ZygoteConnection {
private final MetricsLogger mMetricsLogger = new MetricsLogger(); private final MetricsLogger mMetricsLogger = new MetricsLogger();
private static HiddenApiUsageLogger sInstance = new HiddenApiUsageLogger(); private static HiddenApiUsageLogger sInstance = new HiddenApiUsageLogger();
private int mHiddenApiAccessLogSampleRate = 0;
public static void setHiddenApiAccessLogSampleRate(int sampleRate) {
sInstance.mHiddenApiAccessLogSampleRate = sampleRate;
}
public static HiddenApiUsageLogger getInstance() { public static HiddenApiUsageLogger getInstance() {
return HiddenApiUsageLogger.sInstance; return HiddenApiUsageLogger.sInstance;
} }
public void hiddenApiUsed(String packageName, String signature, public void hiddenApiUsed(int sampledValue, String packageName, String signature,
int accessMethod, boolean accessDenied) { int accessMethod, boolean accessDenied) {
if (sampledValue < mHiddenApiAccessLogSampleRate) {
logUsage(packageName, signature, accessMethod, accessDenied);
}
}
private void logUsage(String packageName, String signature, int accessMethod,
boolean accessDenied) {
int accessMethodMetric = HiddenApiUsageLogger.ACCESS_METHOD_NONE; int accessMethodMetric = HiddenApiUsageLogger.ACCESS_METHOD_NONE;
switch(accessMethod) { switch(accessMethod) {
case HiddenApiUsageLogger.ACCESS_METHOD_NONE: case HiddenApiUsageLogger.ACCESS_METHOD_NONE:
@@ -356,6 +368,7 @@ class ZygoteConnection {
private void handleHiddenApiAccessLogSampleRate(int samplingRate) { private void handleHiddenApiAccessLogSampleRate(int samplingRate) {
try { try {
ZygoteInit.setHiddenApiAccessLogSampleRate(samplingRate); ZygoteInit.setHiddenApiAccessLogSampleRate(samplingRate);
HiddenApiUsageLogger.setHiddenApiAccessLogSampleRate(samplingRate);
ZygoteInit.setHiddenApiUsageLogger(HiddenApiUsageLogger.getInstance()); ZygoteInit.setHiddenApiUsageLogger(HiddenApiUsageLogger.getInstance());
mSocketOutStream.writeInt(0); mSocketOutStream.writeInt(0);
} catch (IOException ioe) { } catch (IOException ioe) {