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

Commit 24897bdb authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge "Remove flag dump_attestation_verifications" into main

parents 7543cedb a0341118

core/java/android/security/flags.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -67,13 +67,6 @@ flag { 
    bug: "337870680"

}



flag {

    name: "dump_attestation_verifications"

    namespace: "hardware_backed_security"

    description: "Add a dump capability for attestation_verification service"

    bug: "335498868"

}



flag {

  name: "should_trust_manager_listen_for_primary_auth"

  namespace: "biometrics"

services/core/java/com/android/server/security/AttestationVerificationManagerService.java

+0 −5
Original line number Diff line number Diff line
@@ -99,11 +99,6 @@ public class AttestationVerificationManagerService extends SystemService { 
        @Override

        protected void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter writer,

                @Nullable String[] args) {

            if (!android.security.Flags.dumpAttestationVerifications()) {

                super.dump(fd, writer, args);

                return;

            }



            if (!DumpUtils.checkDumpAndUsageStatsPermission(getContext(), TAG, writer)) return;



            final IndentingPrintWriter fout = new IndentingPrintWriter(writer, "    ");