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

Commit 68a95956 authored by Oli Lan's avatar Oli Lan Committed by Android (Google) Code Review
Browse files

Merge "Clear flags when a rollback is committed."

parents 08419d50 41a18d33

services/core/java/com/android/server/rollback/Rollback.java

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.internal.util.ArrayUtils; 
import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.Preconditions;

import com.android.server.LocalServices;

import com.android.server.RescueParty;

import com.android.server.pm.parsing.pkg.AndroidPackage;



import java.io.File;
@@ -540,7 +541,10 @@ class Rollback { 
            PackageInstaller.Session parentSession = packageInstaller.openSession(

                    parentSessionId);



            List<String> packageNames = new ArrayList<>(info.getPackages().size());

            for (PackageRollbackInfo pkgRollbackInfo : info.getPackages()) {

                packageNames.add(pkgRollbackInfo.getPackageName());



                if (pkgRollbackInfo.isApkInApex()) {

                    // No need to issue a downgrade install request for apk-in-apex. It will

                    // be rolled back when its parent apex is downgraded.
@@ -601,6 +605,9 @@ class Rollback { 
                parentSession.addChildSessionId(sessionId);

            }



            // Clear flags.

            RescueParty.resetDeviceConfigForPackages(packageNames);



            Consumer<Intent> onResult = result -> {

                mHandler.post(() -> {

                    assertInWorkerThread();