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

Commit 5cfa8891 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

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

Merge "Revert "OMS: fix listener callbacks triggered by changes to target package"" am: 8303fb42 am: 6cbee7a7 am: 4ad7c2dd
am: 08d8c832

Change-Id: I5b73c2852e5a4a85a2dbb0a0efb903f9df311fa6
parents a32525fc 08d8c832

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

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



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

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

        updateAllOverlaysForTarget(packageName, userId, targetPackage);

        mListener.onOverlaysChanged(packageName, userId);

    }

    }



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

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

        }



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

            mListener.onOverlaysChanged(packageName, userId);

        }

        updateAllOverlaysForTarget(packageName, userId, null);

    }



    /**