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

Commit b059e2f6 authored by JW Wang's avatar JW Wang
Browse files

Use PackageRollbackInfo#getVersionRolledBackFrom to simplify code (2/n) 

PackageRollbackInfo#getVersionRolledBackFrom returns a VersionedPackage
which contains a version code. No need to query the version code from
the package manager.

Bug: 147028082
Test: atest StagedRollbackTest
Change-Id: I769e726183ee99bb9e8c7576bb8b6c21a75fe2ff
parent 8108251a

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

+2 −17
Original line number Original line Diff line number Diff line
@@ -357,15 +357,6 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve 
        }

        }

    }

    }





    private VersionedPackage getVersionedPackage(String packageName) {

        try {

            return new VersionedPackage(packageName, mContext.getPackageManager().getPackageInfo(

                    packageName, 0 /* flags */).getLongVersionCode());

        } catch (PackageManager.NameNotFoundException e) {

            return null;

        }

    }



    /**

    /**

     * Rolls back the session that owns {@code failedPackage}

     * Rolls back the session that owns {@code failedPackage}

     *

     *
@@ -428,14 +419,8 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve 
        List<RollbackInfo> rollbacks = rollbackManager.getAvailableRollbacks();

        List<RollbackInfo> rollbacks = rollbackManager.getAvailableRollbacks();





        for (RollbackInfo rollback : rollbacks) {

        for (RollbackInfo rollback : rollbacks) {

            String samplePackageName = rollback.getPackages().get(0).getPackageName();

            VersionedPackage sample = rollback.getPackages().get(0).getVersionRolledBackFrom();

            VersionedPackage sampleVersionedPackage = getVersionedPackage(samplePackageName);

            rollbackPackage(rollback, sample, PackageWatchdog.FAILURE_REASON_NATIVE_CRASH);

            if (sampleVersionedPackage == null) {

                Slog.e(TAG, "Failed to rollback " + samplePackageName);

                continue;

            }

            rollbackPackage(rollback, sampleVersionedPackage,

                    PackageWatchdog.FAILURE_REASON_NATIVE_CRASH);

        }

        }

    }

    }