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

Commit 039c7f0f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Stop logging the AppIntegrityManager related logs (namely,... 

Merge "Stop logging the AppIntegrityManager related logs (namely, INTEGRITY_CHECK_RESULT_REPORTED and INTEGRITY_RULES_PUSHED) in preparation of the code clean-up of this deprecated component." into main am: 4fe56fd0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3304816



Change-Id: I58dab29ed15dbef98e1282291814ed3db0ae1c4b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a162163 4fe56fd0

services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java

+0 −16
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.pm.parsing.PackageParser2;

import com.android.internal.pm.pkg.parsing.ParsingPackageUtils;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.LocalServices;

import com.android.server.integrity.engine.RuleEvaluationEngine;

import com.android.server.integrity.model.IntegrityCheckResult;
@@ -214,12 +213,6 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { 
                                        version, ruleProvider));

                    }



                    FrameworkStatsLog.write(

                            FrameworkStatsLog.INTEGRITY_RULES_PUSHED,

                            success,

                            ruleProvider,

                            version);



                    Intent intent = new Intent();

                    intent.putExtra(EXTRA_STATUS, success ? STATUS_SUCCESS : STATUS_FAILURE);

                    try {
@@ -346,15 +339,6 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { 
                                packageName, result.getEffect(), result.getMatchedRules()));

            }



            FrameworkStatsLog.write(

                    FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED,

                    packageName,

                    appCertificates.toString(),

                    appInstallMetadata.getVersionCode(),

                    installerPackageName,

                    result.getLoggingResponse(),

                    result.isCausedByAppCertRule(),

                    result.isCausedByInstallerRule());

            mPackageManagerInternal.setIntegrityVerificationResult(

                    verificationId,

                    result.getEffect() == IntegrityCheckResult.Effect.ALLOW

services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java

+0 −17
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.server.integrity.model; 
import android.annotation.Nullable;

import android.content.integrity.Rule;



import com.android.internal.util.FrameworkStatsLog;



import java.util.Collections;

import java.util.List;
@@ -82,21 +80,6 @@ public final class IntegrityCheckResult { 
        return new IntegrityCheckResult(Effect.DENY, ruleList);

    }



    /**

     * Returns the in value of the integrity check result for logging purposes.

     */

    public int getLoggingResponse() {

        if (getEffect() == Effect.DENY) {

            return FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__REJECTED;

        } else if (getEffect() == Effect.ALLOW && getMatchedRules().isEmpty()) {

            return FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__ALLOWED;

        } else if (getEffect() == Effect.ALLOW && !getMatchedRules().isEmpty()) {

            return FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__FORCE_ALLOWED;

        } else {

            throw new IllegalStateException("IntegrityCheckResult is not valid.");

        }

    }



    /** Returns true when the {@code mEffect} is caused by an app certificate mismatch. */

    public boolean isCausedByAppCertRule() {

        return mRuleList.stream().anyMatch(rule -> rule.getFormula().isAppCertificateFormula());

services/tests/servicestests/src/com/android/server/integrity/model/IntegrityCheckResultTest.java

+0 −9
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import android.content.integrity.AtomicFormula; 
import android.content.integrity.CompoundFormula;

import android.content.integrity.Rule;



import com.android.internal.util.FrameworkStatsLog;



import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;
@@ -40,8 +38,6 @@ public class IntegrityCheckResultTest { 


        assertThat(allowResult.getEffect()).isEqualTo(IntegrityCheckResult.Effect.ALLOW);

        assertThat(allowResult.getMatchedRules()).isEmpty();

        assertThat(allowResult.getLoggingResponse())

                .isEqualTo(FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__ALLOWED);

    }



    @Test
@@ -58,9 +54,6 @@ public class IntegrityCheckResultTest { 


        assertThat(allowResult.getEffect()).isEqualTo(IntegrityCheckResult.Effect.ALLOW);

        assertThat(allowResult.getMatchedRules()).containsExactly(forceAllowRule);

        assertThat(allowResult.getLoggingResponse())

                .isEqualTo(

                        FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__FORCE_ALLOWED);

    }



    @Test
@@ -77,8 +70,6 @@ public class IntegrityCheckResultTest { 


        assertThat(denyResult.getEffect()).isEqualTo(IntegrityCheckResult.Effect.DENY);

        assertThat(denyResult.getMatchedRules()).containsExactly(failedRule);

        assertThat(denyResult.getLoggingResponse())

                .isEqualTo(FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__REJECTED);

    }



    @Test