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

Commit c2351d1d authored by Mårten Kongstad's avatar Mårten Kongstad Committed by android-build-merger
Browse files

Merge "OMS: fix listener callbacks triggered by changes to target package" 

am: 637dbcbb

Change-Id: I14d16f460146ac49d89334e41409a90908f04671
parents 2e1c6439 637dbcbb

services/core/java/com/android/server/om/OverlayManagerServiceImpl.java

+6 −3
Original line number Diff line number Diff line
@@ -169,9 +169,10 @@ final class OverlayManagerServiceImpl { 
        }



        final PackageInfo targetPackage = mPackageManager.getPackageInfo(packageName, userId);

        updateAllOverlaysForTarget(packageName, userId, targetPackage);

        if (updateAllOverlaysForTarget(packageName, userId, targetPackage)) {

            mListener.onOverlaysChanged(packageName, userId);

        }

    }



    void onTargetPackageChanged(@NonNull final String packageName, final int userId) {

        if (DEBUG) {
@@ -210,7 +211,9 @@ final class OverlayManagerServiceImpl { 
            Slog.d(TAG, "onTargetPackageRemoved packageName=" + packageName + " userId=" + userId);

        }



        updateAllOverlaysForTarget(packageName, userId, null);

        if (updateAllOverlaysForTarget(packageName, userId, null)) {

            mListener.onOverlaysChanged(packageName, userId);

        }

    }



    /**