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

Commit 3bc0eb1f authored by Thiébaud Weksteen's avatar Thiébaud Weksteen Committed by Android (Google) Code Review
Browse files

Merge "Reapply "CertPinInstallReceiver: remove files at boot time"" into main

parents e13a95bb c6240400

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -9287,11 +9287,15 @@ 


        <receiver android:name="com.android.server.updates.CertPinInstallReceiver"

                android:exported="true"

                android:systemUserOnly="true"

                android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="android.intent.action.UPDATE_PINS" />

                <data android:scheme="content" android:host="*" android:mimeType="*/*" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.BOOT_COMPLETED" />

            </intent-filter>

        </receiver>



        <receiver android:name="com.android.server.updates.IntentFirewallInstallReceiver"

services/core/java/com/android/server/updates/CertPinInstallReceiver.java

+19 −1
Original line number Diff line number Diff line
@@ -19,7 +19,10 @@ package com.android.server.updates; 
import android.content.Context;

import android.content.Intent;



import java.io.File;



public class CertPinInstallReceiver extends ConfigUpdateInstallReceiver {

    private static final String KEYCHAIN_DIR = "/data/misc/keychain/";



    public CertPinInstallReceiver() {

        super("/data/misc/keychain/", "pins", "metadata/", "version");
@@ -27,7 +30,22 @@ public class CertPinInstallReceiver extends ConfigUpdateInstallReceiver { 


    @Override

    public void onReceive(final Context context, final Intent intent) {

        if (!com.android.server.flags.Flags.certpininstallerRemoval()) {

        if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {

            if (com.android.server.flags.Flags.certpininstallerRemoval()) {

                File pins = new File(KEYCHAIN_DIR + "pins");

                if (pins.exists()) {

                    pins.delete();

                }

                File version = new File(KEYCHAIN_DIR + "metadata/version");

                if (version.exists()) {

                    version.delete();

                }

                File metadata = new File(KEYCHAIN_DIR + "metadata");

                if (metadata.exists()) {

                    metadata.delete();

                }

            }

        } else if (!com.android.server.flags.Flags.certpininstallerRemoval()) {

            super.onReceive(context, intent);

        }

    }