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

Commit be9e4032 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[pm] fix missing VPN state due to clearKeystoreData" into main

parents 61a25925 4201b777

services/core/java/com/android/server/pm/RemovePackageHelper.java

+5 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.pm;



import static android.content.pm.PackageManager.UNINSTALL_REASON_UNKNOWN;

import static android.os.Process.SYSTEM_UID;

import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER;

import static android.os.incremental.IncrementalManager.isIncrementalPath;

import static android.os.storage.StorageManager.FLAG_STORAGE_CE;
@@ -350,7 +351,10 @@ final class RemovePackageHelper { 
                    sharedUserPkgs, userId);

        }



        // Step 6: detroy keystore data.

        // Step 6: destroy keystore data except for an app that shares SYSTEM_UID.

        if (ps.getAppId() == SYSTEM_UID) {

            return;

        }

        mPm.mInjector.getBackgroundHandler().post(() -> {

            try {

                Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER,