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

Commit 39138d76 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix potential crash issue in NonRequiredPackageDeleteObserver" into main am: 471e041b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3037153



Change-Id: Ia0991cedadbca9ac2988bb777bd908611edd1e7e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 52e62919 471e041b

services/devicepolicy/java/com/android/server/devicepolicy/NonRequiredPackageDeleteObserver.java

+13 −14
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.util.Slog; 


import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.atomic.AtomicInteger;



/**

 * Awaits the deletion of all the non-required apps.
@@ -33,38 +32,38 @@ import java.util.concurrent.atomic.AtomicInteger; 
final class NonRequiredPackageDeleteObserver extends IPackageDeleteObserver.Stub {

    private static final int PACKAGE_DELETE_TIMEOUT_SEC = 30;



    private final AtomicInteger mPackageCount = new AtomicInteger(/* initialValue= */ 0);

    private final CountDownLatch mLatch;

    private boolean mSuccess;

    private boolean mFailed = false;



    NonRequiredPackageDeleteObserver(int packageCount) {

        this.mLatch = new CountDownLatch(packageCount);

        this.mPackageCount.set(packageCount);

    }



    @Override

    public void packageDeleted(String packageName, int returnCode) {

        if (returnCode != PackageManager.DELETE_SUCCEEDED) {

            Slog.e(LOG_TAG, "Failed to delete package: " + packageName);

            mLatch.notifyAll();

            return;

        }

        int currentPackageCount = mPackageCount.decrementAndGet();

        if (currentPackageCount == 0) {

            mSuccess = true;

            Slog.i(LOG_TAG, "All non-required system apps with launcher icon, "

                    + "and all disallowed apps have been uninstalled.");

            mFailed = true;

        }

        mLatch.countDown();

    }



    public boolean awaitPackagesDeletion() {

        try {

            mLatch.await(PACKAGE_DELETE_TIMEOUT_SEC, TimeUnit.SECONDS);

            if (mLatch.await(PACKAGE_DELETE_TIMEOUT_SEC, TimeUnit.SECONDS)) {

                if (!mFailed) {

                    Slog.i(LOG_TAG, "All non-required system apps with launcher icon, "

                            + "and all disallowed apps have been uninstalled.");

                }

                return !mFailed;

            } else {

                Slog.i(LOG_TAG, "Waiting time elapsed before all package deletion finished");

                return false;

            }

        } catch (InterruptedException e) {

            Log.w(LOG_TAG, "Interrupted while waiting for package deletion", e);

            Thread.currentThread().interrupt();

            return false;

        }

        return mSuccess;

    }

}